Update keep upgrade jjb

Change-Id: I720d2c6555e5ff7b0cf05ec641d1189d6dd116ef

diff --git a/jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml
index 98f29207562b3dec7841ce7708e286ca6b1ec902..a57bbb9484212ccfcdbee86b2b20c7bd8e24957d 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: keep_capm3_e2e_upgrade_tests
-    name: '{job_prefix}_keep_{proj}_main_e2e_upgrade_test_{image_os}'
+    name: '{job_prefix}_keep_{proj}_{upgrade_from_release}_main_e2e_upgrade_test_{image_os}'
     description: "Keep CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
@@ -85,6 +85,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:
@@ -102,7 +106,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-upgrade-main(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/keep-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/projects.yml b/jjb/metal3/projects.yml
index 0893609708ddd14cb1c53f1885ffc53880d52f7d..bcd51e82f34d00711f32cfd393ec187147f94c4d 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -360,6 +360,11 @@
                   - 'release-1.4'
       - keep_capm3_e2e_feature_tests:
       - keep_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