metal3: Parameterize version and reorganize projects

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

diff --git a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_main_feature_tests_upgrade.yml
similarity index 91%
rename from jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
rename to jjb/metal3/job_main_feature_tests_upgrade.yml
index 6138de05c061474d31556a8c901bf1f040386f36..f7cd89575565578d9e7672a59cdd33ff6e9c5b1c 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade.yml
@@ -26,9 +26,9 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: main_feature_tests_upgrade_ubuntu
-    name: '{job_prefix}_main_feature_tests_upgrade_ubuntu'
-    description: "Upgrade main tests on Ubuntu."
+    id: main_feature_tests_upgrade
+    name: '{job_prefix}_main_feature_tests_upgrade_{image_os}'
+    description: "Upgrade main tests on {image_os}."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -36,11 +36,11 @@
     parameters:
     - string:
         name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        default: '{org}'
         description: 'Project github repo org name'
     - string:
         name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        default: '{repo}'
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
@@ -48,7 +48,7 @@
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        default: 'https://github.com/{org}/{repo}.git'
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
@@ -56,7 +56,7 @@
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
-        default: 'ubuntu'
+        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