From a554a62e67fd94c63180119606d6d047c47f42dc Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Wed, 22 Sep 2021 14:47:13 +0300 Subject: [PATCH] Add KUBERNETES_VERSION in integration and image building jobs Change-Id: I2dfb9441dcc4d593b33852dc458abe9dfb55f0d1 --- jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml | 6 +++++- jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml | 6 +++++- .../job_capi_bm_v1a4_master_integration_tests_centos.yml | 6 +++++- .../job_capi_bm_v1a4_master_integration_tests_ubuntu.yml | 6 +++++- jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml | 6 +++++- jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml | 6 +++++- .../job_capi_bm_v1a5_master_integration_tests_centos.yml | 6 +++++- .../job_capi_bm_v1a5_master_integration_tests_ubuntu.yml | 6 +++++- jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml | 6 +++++- jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml | 6 +++++- jjb/airship/job_openstack_image_building.yml | 7 ++++++- jjb/airship/job_openstack_node_image_building.yml | 7 ++++++- 12 files changed, 62 insertions(+), 12 deletions(-) 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 238b91e3f..4fe1c682d 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml @@ -73,7 +73,11 @@ 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: days-to-keep: 30 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 671345d00..e878814c5 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml @@ -73,7 +73,11 @@ 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: days-to-keep: 30 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 cd45d7cd5..0ba9bb44d 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,7 +73,11 @@ 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: days-to-keep: 30 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 066a76aa9..1dabb07d9 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,7 +73,11 @@ 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: days-to-keep: 30 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 3929242fe..0e0d7802c 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml @@ -73,7 +73,11 @@ 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_bm_v1a5_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml index 90290a216..8cc6b960c 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml @@ -73,7 +73,11 @@ 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_bm_v1a5_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml index be874464e..1e6e2d191 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,7 +73,11 @@ 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_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml index 922938aea..3e3b0f16d 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,7 +73,11 @@ 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 7afd3a294..c7ba0e823 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml @@ -77,7 +77,11 @@ 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: days-to-keep: 30 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 4306994c8..32a242d01 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml @@ -77,7 +77,11 @@ 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: days-to-keep: 30 diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/airship/job_openstack_image_building.yml index 6261f518e..6e7b0415a 100644 --- a/jjb/airship/job_openstack_image_building.yml +++ b/jjb/airship/job_openstack_image_building.yml @@ -32,7 +32,12 @@ defaults: global disabled: False concurrent: True - + parameters: + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 diff --git a/jjb/airship/job_openstack_node_image_building.yml b/jjb/airship/job_openstack_node_image_building.yml index 42f1a7d9c..8e257ee83 100644 --- a/jjb/airship/job_openstack_node_image_building.yml +++ b/jjb/airship/job_openstack_node_image_building.yml @@ -32,7 +32,12 @@ defaults: global disabled: False concurrent: True - + parameters: + - string: + name: KUBERNETES_VERSION + default: "v1.22.0" + description: 'Kubernetes version' + properties: - build-discarder: days-to-keep: 30 -- 2.25.1