X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fjob_integration_tests.yml;h=20a6ca205f681be56b87a2b3f40994c3578ad642;hb=3b5d5d8f359a4207872edf32773fdb72c3193eb7;hp=c8e52af9ad84d35b4f2bf44692b4aa234b10baee;hpb=146f50a3252eb3334f04d5031d7dd26f9082a976;p=infra%2Fcicd.git

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index c8e52af9..20a6ca20 100644
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -25,11 +25,11 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: integration_tests
-    name: '{job_prefix}_{proj}_{version}_integration_test_{image_os}'
-    description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
+    name: '{job_prefix}_{proj}_{capm3_target_branch}_integration_test_{image_os}{name_postfix}'
+    description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os} with ironic installed from {ironic_install_type}."
+    id: 'integration_tests'
     project-type: pipeline
-    defaults: global
+    defaults: integration-default-values
     disabled: False
     concurrent: True
     parameters:
@@ -53,6 +53,10 @@
         name: ghprbTargetBranch
         default: 'main'
         description: 'Target branch of the PR'
+    - string:
+        name: capm3_release_branch
+        default: '{capm3_release_branch}'
+        description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: IMAGE_OS
         default: '{image_os}'
@@ -69,7 +73,10 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: IRONIC_INSTALL_TYPE
+        default: '{ironic_install_type}'
+        description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment'
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -86,7 +93,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{version}-{image_os}-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -94,7 +101,7 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "test-{version}-{image_os}-integration"
+        status-context: "test-{image_os}-integration-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"