From dbc7e4cc58faf592d794fcfcaf96f43de99d2423 Mon Sep 17 00:00:00 2001 From: maelk Date: Wed, 29 Jul 2020 13:04:07 +0300 Subject: [PATCH 1/1] Airship : Update job for CAPM3 v1a4 release Change-Id: I794e40bc371b903c0e598339e188aeb54cb1f514 --- jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml | 6 +++++- jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml | 6 +++++- .../job_capi_bm_v1a3_master_integration_tests_centos.yml | 6 +++++- .../job_capi_bm_v1a3_master_integration_tests_ubuntu.yml | 6 +++++- 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_feature_tests_ubuntu.yml | 6 +++++- jjb/airship/job_master_feature_tests_ubuntu.yml | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml index 55aad2d5..5f116f7f 100644 --- a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha3' - description: 'Cluster API version. Can be v1alpha1, v1alpha2 or v1alpha3.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha3' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Centos' diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml index a57eb336..f1431871 100644 --- a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha3' - description: 'Cluster API version. Can be v1alpha1,v1alpha2 or v1alpha3.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha3' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Ubuntu' diff --git a/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml index 477be11b..b8cb6cfe 100644 --- a/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a3_master_integration_tests_centos.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha3' - description: 'Cluster API version. Can be v1alpha1, v1alpha2 or v1alpha3.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha3' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Centos' diff --git a/jjb/airship/job_capi_bm_v1a3_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a3_master_integration_tests_ubuntu.yml index 232be37e..380a8237 100644 --- a/jjb/airship/job_capi_bm_v1a3_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a3_master_integration_tests_ubuntu.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha3' - description: 'Cluster API version. Can be v1alpha1, v1alpha2 or v1alpha3.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha3' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Ubuntu' 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 1d138542..d650ee24 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha1, v1alpha2, v1alpha3 or v1alpha4.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha4' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Centos' 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 d5a9a3a0..c1e85f25 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha1,v1alpha2, v1alpha3 or v1alpha4.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha4' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Ubuntu' 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 e343c181..6fa3c943 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 @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha1, v1alpha2, v1alpha3 or v1alpha4.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha4' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Centos' 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 928adf8f..c2a66617 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 @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha1, v1alpha2, v1alpha3 or v1alpha4.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha4' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Ubuntu' diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml index b648b277..be50df84 100644 --- a/jjb/airship/job_feature_tests_ubuntu.yml +++ b/jjb/airship/job_feature_tests_ubuntu.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha3 or v1alpha4.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha4' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Ubuntu' diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/airship/job_master_feature_tests_ubuntu.yml index 7310eb7a..3220322c 100644 --- a/jjb/airship/job_master_feature_tests_ubuntu.yml +++ b/jjb/airship/job_master_feature_tests_ubuntu.yml @@ -60,7 +60,11 @@ - string: name: CAPI_VERSION default: 'v1alpha4' - description: 'Cluster API version. Can be v1alpha3 or v1alpha4.' + description: 'Cluster API version. Can be v1alpha3.' + - string: + name: CAPM3_VERSION + default: 'v1alpha4' + description: 'Cluster API provider Metal3 version. Can be v1alpha3 or v1alpha4.' - string: name: TARGET_NODE_OS default: 'Ubuntu' -- 2.25.1