X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fjob_feature_tests.yml;fp=jjb%2Fmetal3%2Fjob_feature_tests_centos.yml;h=a51f5f51ef1b760ce16d930cad98cb51e83bb9e6;hb=refs%2Fchanges%2F09%2F12409%2F2;hp=d7d8989af33e0ae71bca2bbe8e8b49e927584a34;hpb=fba373c23747d6ccc9a53b4ab0364ea61a7b22b8;p=infra%2Fcicd.git

diff --git a/jjb/metal3/job_feature_tests_centos.yml b/jjb/metal3/job_feature_tests.yml
similarity index 92%
rename from jjb/metal3/job_feature_tests_centos.yml
rename to jjb/metal3/job_feature_tests.yml
index d7d8989a..a51f5f51 100644
--- a/jjb/metal3/job_feature_tests_centos.yml
+++ b/jjb/metal3/job_feature_tests.yml
@@ -25,9 +25,9 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: feature_tests_centos
-    name: '{job_prefix}_{name}_feature_tests_centos'
-    description: "Inspection, remediation, pivoting, node reuse and repivoting feature tests on Centos."
+    id: feature_tests
+    name: '{job_prefix}_{name}_feature_tests_{image_os}'
+    description: "Inspection, remediation, pivoting, node reuse and repivoting feature tests on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -55,7 +55,7 @@
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
-        default: 'centos'
+        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: CAPI_VERSION
@@ -75,7 +75,7 @@
         description: 'Number of libvirt VMs.'
     - string:
         name: TESTS_FOR
-        default: "feature_tests_centos"
+        default: "feature_tests_{image_os}"
         description: 'Tests for pivoting and remediation.'
 
     properties:
@@ -94,7 +94,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-features-centos(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-features-{image_os}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -106,7 +106,7 @@
           - 'main'
           - 'release-0.5'
           - 'release-0.1'
-        status-context: "test-features-centos"
+        status-context: "test-features-{image_os}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"