fix default ironic image build parameters

Change-Id: Ic0cb46e9f3356f8e782c88b5b75efe5bacee8bf5

diff --git a/jjb/metal3/job_ironic_image_build_test.yml b/jjb/metal3/job_ironic_image_build_test.yml
index 1ce9c90488f298ffc16c4a9e5c6f04975b8cb86f..2753c826e20d633b938479c965b97f74ad9c56a1 100644 (file)
--- a/jjb/metal3/job_ironic_image_build_test.yml
+++ b/jjb/metal3/job_ironic_image_build_test.yml
@@ -41,6 +41,18 @@
         name: PROJECT_REPO_NAME
         default: '{repo}'
         description: 'Project github repo name'
+    - string:
+        name: ghprbActualCommit
+        default: 'main'
+        description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{org}/{repo}.git'
+        description: 'CI Repo URL for triggering manual build'
+    - string:
+        name: ghprbTargetBranch
+        default: 'main'
+        description: 'Target branch of the PR'
     - string:
         name: PATCHFILE_CONTENT
         default: ''

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index abc599c55c534bf7d57a7f7b6e099e1bbfa1fc13..c4bc5af56feb159b796d9faade4fd531bc3c5154 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -276,8 +276,8 @@
     proj:
       - project_infra:
           repo: project-infra
-          branch: '${{ghprbActualCommit ?: main}}'
-          ci_github_repo: '${{ghprbAuthorRepoGitUrl ?: https://github.com/metal3-io/project-infra.git}}'
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
       - ironic_image:
           repo: ironic-image
     jobs: