parameterise upgrade job with upgrade_from_release

[infra/cicd.git] / jjb / metal3 / job_capm3_e2e_upgrade_tests.yml

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