From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Thu, 14 Nov 2019 16:56:02 +0000 (+0400)
Subject: Use new inject for tempest jobs
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ac6d88ec60d57c49ea68005842e3b0fabe9fb77b;p=tools%2Fsustaining.git

Use new inject for tempest jobs

Change-Id: I3ada9da86eb03fb21f68aadc5583a0c3b249563f
---

diff --git a/maintenance-ci/mos/jobs/tempest.create_env.yaml b/maintenance-ci/mos/jobs/tempest.create_env.yaml
index 3f0e694..e5c9484 100644
--- a/maintenance-ci/mos/jobs/tempest.create_env.yaml
+++ b/maintenance-ci/mos/jobs/tempest.create_env.yaml
@@ -29,31 +29,39 @@
         name: MAGNET_LINK_OVERWRITE
         description: "Which ISO to use in tests"
         default: !include-raw: ../data/9.0-iso
+    # 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: "@@@"
     - bool:
         name: UPDATE_MASTER_VIA_MOS_MU
         default: true
diff --git a/maintenance-ci/mos/jobs/tempest.yaml b/maintenance-ci/mos/jobs/tempest.yaml
index 4da1b70..396c062 100644
--- a/maintenance-ci/mos/jobs/tempest.yaml
+++ b/maintenance-ci/mos/jobs/tempest.yaml
@@ -20,31 +20,34 @@
         name: FUEL_QA_GERRIT_REVIEW
         description: "gerrit review num"
         default: ""
+    # 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=@@@
     - string:
           name: INTERFACE_MODEL
           default: virtio
diff --git a/maintenance-ci/mos/templates/tempest.multijob.yaml b/maintenance-ci/mos/templates/tempest.multijob.yaml
index df4ff88..f40fc24 100644
--- a/maintenance-ci/mos/templates/tempest.multijob.yaml
+++ b/maintenance-ci/mos/templates/tempest.multijob.yaml
@@ -38,29 +38,31 @@
     # 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=@@@
     - string:
         name: INTERFACE_MODEL
         default: virtio