metal3: Parameterize version and reorganize projects

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

diff --git a/jjb/metal3/job_feature_tests.yml b/jjb/metal3/job_feature_tests.yml
index a51f5f51ef1b760ce16d930cad98cb51e83bb9e6..4aba1085c7217d24fa643018381a1ca55eecb216 100644 (file)
--- a/jjb/metal3/job_feature_tests.yml
+++ b/jjb/metal3/job_feature_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: feature_tests
-    name: '{job_prefix}_{name}_feature_tests_{image_os}'
+    name: '{job_prefix}_{proj}_feature_tests_{image_os}'
     description: "Inspection, remediation, pivoting, node reuse and repivoting feature tests on {image_os}."
     project-type: pipeline
     defaults: global
@@ -35,11 +35,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
@@ -47,7 +47,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
@@ -85,7 +85,7 @@
         artifact-days-to-keep: -1
         artifact-num-to-keep: -1
     - github:
-        url: https://github.com/{repo[org]}/{repo[name]}
+        url: https://github.com/{org}/{repo}
 
     triggers:
     - github-pull-request: