parameterise upgrade job with upgrade_from_release

Change-Id: Iea324ae8c727b9072020a7cdfe1259d1902e9727

diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index a0e2c3af3b9fd5d4796fdf5fea165a0e7f03be13..e312e5e7e3c6df90d91eb33d8c1893cb8d241dd8 100644 (file)
--- 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 0a6ee1c98531487de23b8b529ac0dc16d124e302..fbff345f4d6a51cb6d807f35e2131e2b29098c1b 100644 (file)
--- 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 44313921fb742f98a2d19d6fc9210194dddef002..cdf877f4fc3deadf5a9510fd8aa08bfff5a5a414 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -292,6 +292,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:
@@ -313,6 +318,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: