set default values for PULL_PULL_SHA and PULL_BASE_REF to

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

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index 43e004d49fc9b141c3cb9d5bec91ecd9f951fcac..030d4c45e215f424c9b7b7ae812e58477eda7ea3 100644 (file)
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -25,7 +25,7 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    name: '{job_prefix}_{proj}_{version}_integration_test_{image_os}{name_postfix}'
+    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
@@ -53,6 +53,14 @@
         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: bmo_release_branch
+        default: '{bmo_release_branch}'
+        description: 'The target branch of BMO to be used for this test'
     - string:
         name: IMAGE_OS
         default: '{image_os}'
@@ -74,13 +82,12 @@
         default: '{ironic_install_type}'
         description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment'
     - string:
-        name: IRONIC_LOCAL_IMAGE
-        default: '{ironic_repo}'
-        description: 'In case of ironic-image PR tested with ironic source install, the source repo of the PR  will be used to build the local ironic-image'
+        name: IRONIC_USE_MARIADB
+        default: '{ironic_use_mariadb}'
+        description: 'If Ironic should use MariaDB or not.'
     - string:
-        name: IRONIC_LOCAL_IMAGE_BRANCH
-        default: '{ironic_branch}'
-        description: 'In case of ironic-image PR tested with ironic source install, the source branch of the PR  will be used to build the local ironic-image'
+        name: BUILD_MARIADB_IMAGE_LOCALLY
+        default: '{build_mariadb_image_locally}'
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -93,11 +100,11 @@
     triggers:
     - github-pull-request:
         admin-list:
-          - '{ci_github_admin_user}'
+        - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{{version}}-{{image_os}}-integration{trigger_postfix}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -105,7 +112,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"
@@ -116,7 +123,7 @@
           url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - '{branch|main}'
+          - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True