metal3: Rename DISTRIBUTION -> IMAGE_OS

IMAGE_OS is the variable that is used when running the tests, so to
avoid unnecessary variables we want the same variable name here also.

Change-Id: I9ddb64414a142ebd78550c4546dec671f0f791a7

diff --git a/jjb/metal3/job_bml_integration_tests_centos.yml b/jjb/metal3/job_bml_integration_tests_centos.yml
index 007fae7a56e1217b1ed5c0d6586bd493db36fd62..8e85e169016436ea8c07feb30b968bfb9b23e895 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_integration_tests_centos.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_bml_main_integration_tests_centos.yml b/jjb/metal3/job_bml_main_integration_tests_centos.yml
index 0ac0628799146b83e192e52f2973569352dc2fdb..161abee425499bdd622aa89dafeb9932e4fee925 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_main_integration_tests_centos.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1a4_integration_tests.yml b/jjb/metal3/job_capm3_v1a4_integration_tests.yml
index feb4d7d2b8dbb6a73a11d72bcf418c33a77e14ab..0dc65995cb4fa76b800fb70bcb34c3ec716277ad 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_integration_tests.yml
+++ b/jjb/metal3/job_capm3_v1a4_integration_tests.yml
@@ -26,8 +26,8 @@
 
 - job-template:
     id: capm3_v1a4_integration_tests
-    name: '{job_prefix}_{name}_v1a4_integration_test_{distribution}'
-    description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on {distribution}."
+    name: '{job_prefix}_{name}_v1a4_integration_test_{image_os}'
+    description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
-        default: '{distribution}'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        name: IMAGE_OS
+        default: '{image_os}'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'
@@ -86,7 +86,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-v1a4-{distribution}-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a4-{image_os}-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -98,7 +98,7 @@
           - 'main'
           - 'release-0.4'
           - 'release-0.0'
-        status-context: "test-v1a4-{distribution}-integration"
+        status-context: "test-v1a4-{image_os}-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
index 2f086e005ebbaea8d904f6228be3f5d3e3186797..2565266599e028975f91fce8fed851c61e838fdb 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'

diff --git a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
index 52c7b142c13f1d90d1c5ea6d8fbb17d3ebccb889..32b1452bc59dea07c3b5a5fef44e4989ed79b6cd 100644 (file)
--- a/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a4_main_integration_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha3'

diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
index 06b1e281bdf969cbceb8cac66912ae16c0ad6cdd..f9908ee4b35837d3b9d44d4618340564bc95824d 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
index aa5ced2931e0375782c83ec3869679fcfd5aaa8e..01611afc06d5e34bf0dba7978c14edf1277bd45e 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
index af788ce6713b0aef757165eb1f3bb7ee6def37c3..4ae113ffd73097149f5f5f38f478afee84c07e95 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
index f0581f9af2a20a0795302c1c476582159e8382cb..0ba8ea8aba0ab637a50a74b9b5f4200213ddaaed 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
index 647c60047b47783af8b0ba29f2fdba07bda3bf4e..b2189baa79fe41798aaa5ca83d8f3d670fdd7ace 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'release-0.5'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
index 3c523f3e8b9ffd117a53c2425a4744c898589323..30d5763f32e07036ec1ff50147853530c2bbd4b8 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_e2e_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'release-0.5'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
index a7650e3e9b4b33e528cddd772d951a3e61c89573..dddd8312573b107bbc66b3e65e4d78f4ed38216c 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
index cd9d181d16855deb9d1cace415735d7fc1b60ca8..a22546a8fe60cb3fa89fcaff3044c72688f235e2 100644 (file)
--- a/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_main_integration_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
index 97e8410bf2c21bbafb8c1062fb4ff211e1f1ea1f..46e4cf6c90945c2be7e91cba716bb7d8f4352bf8 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
index 662d58d95da53a5e582ab0086ce0546df3dbbabf..9df2d449c79d50a1ec35aea0f66cf36199abcab5 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
index 1c46bbcac903bbad6fda0aa28f02d4b02deaf28e..72ad3e823708250102afb65b9e61eb904748b87b 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
index 7a0c7fa6e80b2e9e6cae88d02cd234e4ee2c2300..3369f68a47b9755f006d7b6cb54cc5e5e65bd3a1 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'main'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
index 93a50783456829d9a2b9cca5f26b93322ae33dd5..b6f85687f23638cf387cc2c5916f8b520d1c413a 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'main'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
index b0a6f683a6e15d919008b928d69a0cbc7ba391ef..f053093a2b2798f15ebafe6c976f455167a42e0b 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'main'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
index 0dc064800d2b62d9667727e95168de6fa6ce83ba..1b311b198922551c6b9a227b2e7d914a0f974704 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_e2e_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'main'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
index f0aad6b24033ff8a9f763fcf7de559a3a971d294..acdaa5387d9d2995154b1559f37e1d10c06d1279 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
index e35fbbabe180f896be1604f9a2afb5251d9ee803..4e825f0b986d6288dec2a939a2d5b710947dc1f2 100644 (file)
--- a/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_main_integration_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_feature_tests_centos.yml b/jjb/metal3/job_feature_tests_centos.yml
index bbaf600ab6241072cc4f78c9a48555d19c2c889b..d7d8989af33e0ae71bca2bbe8e8b49e927584a34 100644 (file)
--- a/jjb/metal3/job_feature_tests_centos.yml
+++ b/jjb/metal3/job_feature_tests_centos.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_feature_tests_ubuntu.yml b/jjb/metal3/job_feature_tests_ubuntu.yml
index edc92abafe067d6f0571d73d1753bba0dae33e93..23a55872343979f17d6839bdd56c184cba87061e 100644 (file)
--- a/jjb/metal3/job_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_feature_tests_ubuntu.yml
@@ -54,9 +54,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
index e5aa6c3146cc8ab3042d25002357f251e2219f46..ef751b019acef183cfeb2dff6e853b4622458f24 100644 (file)
--- a/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
index 6856c4555838218209d358bf1ff47d1e3e1c0b90..2c4914d02199ed2027aed009144495027c8deda8 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
index fdcbec36b8226af0af979e47738a38b3b7e19c9a..ff578fc3f27114724f1c1f2701e4e74281d92768 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
index a1e4a2a90a806db6c8bc1952f63ceccf50651ac1..a2ad7ec73866bf4907aa93f2f14f794ab7f8f529 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
@@ -55,9 +55,9 @@
         default: 'main'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
index 19709854a6ee55283d06c260ca4972eddebd0a88..14eeff05e4b36147c6eccf73891bcb8ab18aed59 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
@@ -55,9 +55,9 @@
         default: 'main'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_linter_tests.yml b/jjb/metal3/job_linter_tests.yml
index df5d291c125018d96596706c1df93b99e2a4b179..9959b8d596d46f595b2fc7ddb10e30955374dd54 100644 (file)
--- a/jjb/metal3/job_linter_tests.yml
+++ b/jjb/metal3/job_linter_tests.yml
@@ -45,7 +45,10 @@
         name: ghprbActualCommit
         default: 'master'
         description: 'CI Repo branch for triggering manual build'
-
+    - string:
+        name: IMAGE_OS
+        default: 'ubuntu'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/job_main_feature_tests_centos.yml b/jjb/metal3/job_main_feature_tests_centos.yml
index 6c43e7a3e147357d17f5815216bedf02affa0510..f4a5b61b27e0fbdecf16ab53435552704f48fa93 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_centos.yml
+++ b/jjb/metal3/job_main_feature_tests_centos.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_main_feature_tests_ubuntu.yml b/jjb/metal3/job_main_feature_tests_ubuntu.yml
index 44d05e24cd11152c5108ac6c3df656a98a22e0ce..7e6029e70ca55c10fb240363b1acf2256bdfa3ce 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_ubuntu.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
index d3d565fb042e2f0648a7993cfe307afed7b51763..6138de05c061474d31556a8c901bf1f040386f36 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests.'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
index 61ce70ae2e8dbd284fc62f6c14f3bd8f28893772..84db9cc2ce68db95418571140f548b31b2ea49a6 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'centos'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
index b280bb6734817ef6ebbc96eb278ae5c7ee33e730..f3c31c711dc636b183d735eaad329eb2c12769b1 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
@@ -55,9 +55,9 @@
         default: 'master'
         description: 'Target branch of the PR'
     - string:
-        name: DISTRIBUTION
+        name: IMAGE_OS
         default: 'ubuntu'
-        description: 'Distribution to use for the target host and the tests. Can be ubuntu or centos'
+        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
         default: 'v1beta1'

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 03e54dfb47a643333df821d45d35f24069ce9065..070c39969c3b4dd33cfffca89c4a7208a5bbd7be 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -58,7 +58,7 @@
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution:
+        image_os:
           - ubuntu
           - centos
     - capm3_v1a5_integration_tests_centos
@@ -90,7 +90,7 @@
       name: "baremetal-operator"
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution:
+        image_os:
           - ubuntu
           - centos
     - capm3_v1a5_integration_tests_centos
@@ -110,7 +110,7 @@
       name: "ip-address-manager"
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution:
+        image_os:
           - ubuntu
           - centos
     - capm3_v1a5_integration_tests_centos
@@ -126,7 +126,7 @@
     name: "metal3_dev_env"
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution:
+        image_os:
           - ubuntu
           - centos
     - capm3_v1a4_main_integration_tests_centos
@@ -163,7 +163,7 @@
       name: "cluster-api-provider-metal3"
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution:
+        image_os:
           - ubuntu
           - centos
     - capm3_v1a5_integration_tests_centos
@@ -192,7 +192,7 @@
       name: "ironic-image"
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution:
+        image_os:
           - ubuntu
           - centos
     - capm3_v1a5_integration_tests_centos
@@ -211,7 +211,7 @@
       name: "ironic-ipa-downloader"
     jobs:
     - capm3_v1a4_integration_tests:
-        distribution: ubuntu
+        image_os: ubuntu
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu