Merge "Rename JJB job to include Ironic image building step"

diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
index 289ef860274dda71900c768e14b2896482a6a452..baf5e7a2d38722eb6486060a569e602a46b52f03 100644 (file)
--- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha3'
+        default: 'v1alpha4'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
+        default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 7c13d943274ec0089882ecf5dd5b578ac41e6bdb..7ea564b71a4d5525f2356d2c14da3f6be976aa00 100644 (file)
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -59,11 +59,11 @@
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha3'
+        default: 'v1alpha4'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha4'
+        default: 'v1alpha5'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS