From 45f227af748dcdd9f5b3570a7eae9f0c8ce832d3 Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Fri, 1 Oct 2021 10:48:30 +0300 Subject: [PATCH 1/1] 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 --- jjb/airship/job_airship_integration_test_centos.yml | 4 ---- jjb/airship/job_airship_integration_test_ubuntu.yml | 4 ---- jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml | 4 ---- jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml | 4 ---- .../job_capi_bm_v1a4_master_integration_tests_centos.yml | 4 ---- .../job_capi_bm_v1a4_master_integration_tests_ubuntu.yml | 4 ---- jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml | 4 ---- jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml | 4 ---- .../job_capi_bm_v1a5_master_integration_tests_centos.yml | 4 ---- .../job_capi_bm_v1a5_master_integration_tests_ubuntu.yml | 6 +----- jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml | 4 ---- jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml | 4 ---- jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml | 4 ---- jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml | 4 ---- 14 files changed, 1 insertion(+), 57 deletions(-) diff --git a/jjb/airship/job_airship_integration_test_centos.yml b/jjb/airship/job_airship_integration_test_centos.yml index 56d77aae..716ee0bb 100644 --- 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 70141fc5..c5c87309 100644 --- 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 4fe1c682..83d3afbb 100644 --- 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 e878814c..11c554c2 100644 --- 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 0ba9bb44..619ad065 100644 --- 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 1dabb07d..f6cf7f93 100644 --- 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 0e0d7802..51205adb 100644 --- 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 8cc6b960..7387df28 100644 --- 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 1e6e2d19..04dbddff 100644 --- 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 3e3b0f16..922938ae 100644 --- 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 c7ba0e82..045f3e19 100644 --- 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 32a242d0..fb8bd125 100644 --- 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 48aa86f7..47e0640e 100644 --- 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 6e8d022f..3a45278b 100644 --- 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: -- 2.25.1