Restore new line addition in injext-text macro

Change-Id: I5bd21d49ca3ab67945ee38544e65aab096746c10

diff --git a/maintenance-ci/common/macroses/inject-text-parameter.yaml b/maintenance-ci/common/macroses/inject-text-parameter.yaml
index c91561e8ba023f233b4d56655e3bd1fda45e58df..3b17ed1ed63c22b2c2699756bb29439e0d40175b 100644 (file)
--- a/maintenance-ci/common/macroses/inject-text-parameter.yaml
+++ b/maintenance-ci/common/macroses/inject-text-parameter.yaml
@@ -4,7 +4,7 @@
     - shell: |
         #!/bin/bash
         set -e
-        echo {properties-content} > "inject.text.sh"
+        echo {properties-content} | tr "@@@" "\n" > "inject.text.sh"
 
     - inject:
         properties-file: 'inject.text.sh'
\ No newline at end of file

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml b/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml
index 7546e6c72909d21d3306915203b8bb4da18e8952..65a77fa8a23bd6af7bb1eb5df9b9087a9c3e766d 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml
@@ -11,36 +11,26 @@
         weight: 1
 
     parameters:
-    - bool:
-        name: PREPARE_SWARM
-        default: true
-        description: "Launch jenkins swarm?"
-    - bool:
-        name: CLEANUP_SWARM
-        default: true
-        description: "Wipe jenkins swarm after tests?"
+    - bool: # this one taken away from systest-params macro because we want
+        # different default values for runner job and test jobs
+        name: RUN_REPORTER_AFTER_JOB
+        default: false
+        description: "Report results?"
+    - bool: # same as above - we want to reschedule only swarm-based runs
+        name: RERUN_AFTER_FAILURE
+        default: false
+        description: "Reschedule job after failure?"
     - 9x-systest-params
-    - mos-jenkins-swarm-params
 
     wrappers:
     - timeout:
         fail: true
-        timeout: 1800
+        timeout: 6000
 
     builders:
     - write-description:
         description-string: $CUSTOM_VERSION
 
-    - conditional-step:
-        condition-kind: boolean-expression
-        condition-expression: $PREPARE_SWARM
-        on-evaluation-failure: dont-run
-        steps:
-        - trigger-builds:
-            - project: "deploy-jenkins-swarm"
-              current-parameters: true
-              block: true
-
     - multijob:
         name: 'Run system tests'
         condition: COMPLETED
@@ -52,17 +42,6 @@
           current-parameters: true
           kill-phase-on: NEVER
 
-    - conditional-step:
-        condition-kind: boolean-expression
-        condition-expression: $CLEANUP_SWARM
-        on-evaluation-failure: dont-run
-        steps:
-        - trigger-builds:
-            - project: "delete-heat-stack"
-              predefined-parameters: |
-                STACK_PREFIX=${STACK_PREFIX}
-              block: true
-
     publishers:
     - description-setter:
         regexp: "'Description string: (.*)'"

diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml
index e8fd61b6dac431eaf0f03b7028effcb8407ed813..07b98e58fa3830cbe2c02c973ce66d815ce49b6f 100644 (file)
--- a/maintenance-ci/mos/macroses/9x-systest-params.yaml
+++ b/maintenance-ci/mos/macroses/9x-systest-params.yaml
@@ -53,26 +53,33 @@
     # section for mos rpm repos
     - text:
         name: MOS_MIRROR_OVERWRITES
-        description: "Set of variables to inject to job; add new parameters if needed for run"
+        description: |
+            USE "@@@" AT END OF LINE AS LINE SEPARATOR
+            Set of variables to inject to job; add new parameters if needed for run.
         default: |
-            ENABLE_MOS_CENTOS_OS=true
-            ENABLE_MOS_CENTOS_PROPOSED=true
-            ENABLE_MOS_CENTOS_UPDATES=true
-            ENABLE_MOS_CENTOS_SECURITY=true
-            ENABLE_MOS_CENTOS_HOLDBACK=true
-            ENABLE_MOS_CENTOS_HOTFIX=false
-            MOS_CENTOS_OS_MIRROR_ID_OVERWRITE=
-            MOS_CENTOS_PROPOSED_MIRROR_ID_OVERWRITE=
-            MOS_CENTOS_UPDATES_MIRROR_ID_OVERWRITE=
-            MOS_CENTOS_SECURITY_MIRROR_ID_OVERWRITE=
-            MOS_CENTOS_HOLDBACK_MIRROR_ID_OVERWRITE=
-            MOS_CENTOS_HOTFIX_MIRROR_ID_OVERWRITE=
-            #
-            MOS_UBUNTU_MIRROR_ID_OVERWRITE=
-            ENABLE_MOS_UBUNTU_PROPOSED=true
-            ENABLE_MOS_UBUNTU_UPDATES=true
-            ENABLE_MOS_UBUNTU_SECURITY=true
-            ENABLE_MOS_UBUNTU_HOLDBACK=true
-            ENABLE_MOS_UBUNTU_HOTFIX=false
-            UBUNTU_MIRROR_ID_OVERWRITE=
-            CENTOS_MIRROR_ID_OVERWRITE=
+            ENABLE_MOS_CENTOS_OS=true@@@
+            ENABLE_MOS_CENTOS_PROPOSED=true@@@
+            ENABLE_MOS_CENTOS_UPDATES=true@@@
+            ENABLE_MOS_CENTOS_SECURITY=true@@@
+            ENABLE_MOS_CENTOS_HOLDBACK=true@@@
+            ENABLE_MOS_CENTOS_HOTFIX=false@@@
+            MOS_CENTOS_OS_MIRROR_ID_OVERWRITE=@@@
+            MOS_CENTOS_PROPOSED_MIRROR_ID_OVERWRITE=@@@
+            MOS_CENTOS_UPDATES_MIRROR_ID_OVERWRITE=@@@
+            MOS_CENTOS_SECURITY_MIRROR_ID_OVERWRITE=@@@
+            MOS_CENTOS_HOLDBACK_MIRROR_ID_OVERWRITE=@@@
+            MOS_CENTOS_HOTFIX_MIRROR_ID_OVERWRITE=@@@
+            #@@@
+            MOS_UBUNTU_MIRROR_ID_OVERWRITE=@@@
+            ENABLE_MOS_UBUNTU_PROPOSED=true@@@
+            ENABLE_MOS_UBUNTU_UPDATES=true@@@
+            ENABLE_MOS_UBUNTU_SECURITY=true@@@
+            ENABLE_MOS_UBUNTU_HOLDBACK=true@@@
+            ENABLE_MOS_UBUNTU_HOTFIX=false@@@
+            UBUNTU_MIRROR_ID_OVERWRITE=@@@
+            CENTOS_MIRROR_ID_OVERWRITE=@@@
+    - text:
+        name: EXTRA_OPTS
+        description: |
+            USE "@@@" AT END OF LINE AS LINE SEPARATOR
+        default: "@@@"
\ No newline at end of file

diff --git a/maintenance-ci/mos/templates/swarm-test.yaml b/maintenance-ci/mos/templates/swarm-test.yaml
index 23cca94ac760d54586d6e98ad001484662c7d6c8..77e895d64bb7cff30a7f709c62b3c33dca2451c2 100644 (file)
--- a/maintenance-ci/mos/templates/swarm-test.yaml
+++ b/maintenance-ci/mos/templates/swarm-test.yaml
@@ -49,9 +49,6 @@
         default: false
         description: "Reschedule job after failure?"
     - 9x-systest-params
-    - text:
-        name: EXTRA_OPTS
-        default: ""
 
     properties:
     - heavy-job: