From 24a6bc6e2e7b89cd99bedce8985d4901a1064f86 Mon Sep 17 00:00:00 2001 From: Sunnatillo Date: Fri, 28 Jan 2022 13:53:43 +0200 Subject: [PATCH] Add KUBERNETES_VERSION as a default value to airship dev tool integration tests Update default CAPI and CAPM3 version to v1beta1 Change-Id: Ieea9aa2a82d2598bbc6e296ade04ea2e48f890a4 --- jjb/airship/job_airship_integration_test_centos.yml | 8 ++++++-- jjb/airship/job_airship_integration_test_ubuntu.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/jjb/airship/job_airship_integration_test_centos.yml b/jjb/airship/job_airship_integration_test_centos.yml index 24fcaefaa..a11f99dfe 100644 --- a/jjb/airship/job_airship_integration_test_centos.yml +++ b/jjb/airship/job_airship_integration_test_centos.yml @@ -59,11 +59,11 @@ description: 'Distribution to use for the tests. Can be ubuntu or centos' - string: name: CAPI_VERSION - default: 'v1alpha4' + default: 'v1beta1' description: 'Cluster API version. Can be v1alpha4.' - string: name: CAPM3_VERSION - default: 'v1alpha5' + default: 'v1beta1' description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.' - string: name: TARGET_NODE_OS @@ -73,6 +73,10 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' + - string: + name: KUBERNETES_VERSION + default: "v1.23.3" + 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 c5c87309f..487915921 100644 --- a/jjb/airship/job_airship_integration_test_ubuntu.yml +++ b/jjb/airship/job_airship_integration_test_ubuntu.yml @@ -59,11 +59,11 @@ description: 'Distribution to use for the tests. Can be ubuntu or centos' - string: name: CAPI_VERSION - default: 'v1alpha4' + default: 'v1beta1' description: 'Cluster API version. Can be v1alpha4.' - string: name: CAPM3_VERSION - default: 'v1alpha5' + default: 'v1beta1' description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.' - string: name: TARGET_NODE_OS @@ -73,6 +73,10 @@ name: TARGET_NODE_MEMORY default: 4096 description: 'RAM size of the target host.' + - string: + name: KUBERNETES_VERSION + default: "v1.23.3" + description: 'Kubernetes version' properties: - build-discarder: -- 2.25.1