Don't expose KUBERNETES_VERSION to JJB

It was bad idea to expose KUBERNETES_VERSION var to integration
test JJB files because we have many of them, and we are now required
to add this var in almost every single integration test builder.
It is easier to control it from project-infra rather.

Change-Id: Ifd0c7ef9b109860ce91f1bfa3674c2f61ea85d89

diff --git a/jjb/airship/job_airship_integration_test_centos.yml b/jjb/airship/job_airship_integration_test_centos.yml
index 56d77aae4a84599afdfa603cdcbdf3537199dfed..716ee0bb4598563063c2b09f1d81436c6682e5bf 100644 (file)
--- a/jjb/airship/job_airship_integration_test_centos.yml
+++ b/jjb/airship/job_airship_integration_test_centos.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_airship_integration_test_ubuntu.yml b/jjb/airship/job_airship_integration_test_ubuntu.yml
index 70141fc5a3760df1383fd8380e825b10fbd0d21b..c5c87309f0be9c08d82ea9e67cdd4665857e3247 100644 (file)
--- a/jjb/airship/job_airship_integration_test_ubuntu.yml
+++ b/jjb/airship/job_airship_integration_test_ubuntu.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
index 4fe1c682d65cd2213bb9bfe4d4a3c613481041bc..83d3afbb5df9073b907be9f0cf7644db49a28821 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
index e878814c53fd1947a0ab2d943bf8010b0c5b96c5..11c554c273ee68d80484596b8ecbcca3148262fa 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
index 0ba9bb44d5dd141a3baa11fb678cd50152783ec7..619ad065789f56152b9a1fea12b011fd997bcdcb 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
index 1dabb07d9bda5d68550ddf754f276f9a4728ac9c..f6cf7f939d977dcf9ec1a5511557979d20167aa7 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
index 0e0d7802c42fff8092bbf8ae3a3b74253fff6b36..51205adb64b08e34da29182a632a6c32e210c484 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
index 8cc6b960c6c7dcc83502e7bb906c19fb19b1d86f..7387df28359294b4880f5de5f7f043fac4a88029 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
index 1e6e2d19192cc624e55b02979c285e010c9d5918..04dbddff72a2f49ce1f55465adfe91f66d2bc4f1 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
@@ -73,10 +73,6 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
index 3e3b0f16d918fbf133bcf9cc95760229a820b43c..922938aea2c8b170fb09425df7357f883dc8c17a 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
@@ -73,11 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
-         
+
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
index c7ba0e8232675626b97755f08600fd5ccf7b600c..045f3e1918d656a675a8c323b8dd1bceb4a81f02 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
@@ -77,10 +77,6 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
index 32a242d0184a1a13a7ac2f9663e2ed7b2d7875c0..fb8bd1258adce61b262f74571f3b7a6f4baceec8 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
@@ -77,10 +77,6 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
index 48aa86f7c27531c7c46e9b4f2e02a1c51c3c5c52..47e0640e115753c10bedd5c1c682abe1100fca79 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
@@ -81,10 +81,6 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:

diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
index 6e8d022f215e648ea832c38fc65be2878a3ace58..3a45278b77efb177a50ed9b3a683db9ca8bc74f7 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
@@ -81,10 +81,6 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder: