Merge "parameterise upgrade job with upgrade_from_release"
diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index a0e2c3a..e312e5e 100644
--- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
@@ -26,7 +26,7 @@
- job-template:
id: capm3_e2e_upgrade_tests
- name: '{job_prefix}_{proj}_main_e2e_upgrade_test_{image_os}'
+ name: '{job_prefix}_{proj}_{upgrade_from_release}_main_e2e_upgrade_test_{image_os}'
description: "CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
project-type: pipeline
defaults: global
@@ -81,6 +81,10 @@
name: GINKGO_FOCUS
default: "upgrade"
description: 'Select the e2e upgrade test'
+ - string:
+ name: UPGRADE_FROM_RELEASE
+ default: '{upgrade_from}'
+ description: 'Release to upgrade from'
properties:
- build-discarder:
@@ -98,7 +102,7 @@
org-list: "{ci_github_whitelist_org}"
cron: 'H/5 * * * *'
auth-id: "{ci_ghprb_auth_id}"
- trigger-phrase: '((.|\n)*\s)?/test-e2e-upgrade-main(\s(.|\n)*)?'
+ trigger-phrase: '((.|\n)*\s)?/test-e2e-upgrade-main-{upgrade_from_release}(\s(.|\n)*)?'
skip-build-phrase: '/skip-test'
only-trigger-phrase: True
github-hooks: True
diff --git a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
index 0a6ee1c..fbff345 100644
--- a/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
@@ -26,7 +26,7 @@
- job-template:
id: capm3_main_e2e_upgrade_tests
- name: '{job_prefix}_daily_main_e2e_upgrade_test_{image_os}'
+ name: '{job_prefix}_daily_{upgrade_from_release}_main_e2e_upgrade_test_{image_os}'
description: "CAPM3 v1alpha5 to v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on ubuntu."
project-type: pipeline
defaults: global
@@ -81,6 +81,10 @@
name: GINKGO_FOCUS
default: "upgrade"
description: 'Select the e2e upgrade test'
+ - string:
+ name: UPGRADE_FROM_RELEASE
+ default: '{upgrade_from}'
+ description: 'Release to upgrade from'
properties:
- build-discarder:
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b662c7f..a75d60c 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -294,6 +294,11 @@
- 'release-1.1'
jobs:
- capm3_e2e_upgrade_tests:
+ upgrade_from_release:
+ - from-release-1-1:
+ upgrade_from: v1.1.
+ - from-release-0-5:
+ upgrade_from: v0.5.
exclude:
- image_os: centos
- capm3_e2e_integration_tests:
@@ -315,6 +320,11 @@
- centos
jobs:
- capm3_main_e2e_upgrade_tests:
+ upgrade_from_release:
+ - from-release-1-1:
+ upgrade_from: 1.1
+ - from-release-0-5:
+ upgrade_from: 0.5
exclude:
- image_os: centos
- capm3_main_e2e_ephemeral_tests: