Meridio: Archive all in _output and increase timeout

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

diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
index 6886dc34d25c9f726be2bc0f898024d5e50a5a11..2596360a9c831ca55c0ad80658e2a7326cd1ad2b 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm.yml
+++ b/jjb/metal3/job_keep_integration_vm.yml
@@ -27,7 +27,7 @@
 
 - job-template:
     id: keep_integration_tests
-    name: '{job_prefix}_{proj}_keep_{version}_test_{image_os}_alive'
+    name: '{job_prefix}_{proj}_keep_{capm3_target_branch}_test_{image_os}_alive'
     description: "CAPM3 {capm3_version} integration tests for keeping the vm for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
@@ -58,6 +58,10 @@
         name: IMAGE_OS
         default: '{image_os}'
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+    - string:
+        name: capm3_release_branch
+        default: '{capm3_release_branch}'
+        description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: CAPI_VERSION
         default: '{capi_version}'
@@ -91,7 +95,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{version}-{image_os}-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-integration-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -99,7 +103,7 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "keep-test-{version}-{image_os}-integration"
+        status-context: "keep-test-{image_os}-integration-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"