From: Feruzjon Muyassarov Date: Mon, 4 Oct 2021 10:38:24 +0000 (+0000) Subject: Merge "Don't expose KUBERNETES_VERSION to JJB" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=1e4e114ba4bde3dc850838f7905f609faa56a895;hp=ea0dea3733a4a6630ca58c78478d00173dffe2ab;p=infra%2Fcicd.git Merge "Don't expose KUBERNETES_VERSION to JJB" --- 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: