remove unusable ironic image parameters

[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 c8e52af9ad84d35b4f2bf44692b4aa234b10baee..e521497c270be121a8ab3e1acffdba34e213a1ab 100644 (file)
--- 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}_{version}_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:
@@ -69,7 +69,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 +89,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-{version}-{image_os}-integration{trigger_postfix}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True