From: Rozzii <adam.rozman@est.tech>
Date: Tue, 12 Apr 2022 08:18:32 +0000 (+0300)
Subject: fix default ironic image build parameters
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=0e1e77a8c38c7953b6bb086a3ea16113e0e40ecf;p=infra%2Fcicd.git

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 1ce9c9048..2753c826e 100644
--- 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 abc599c55..c4bc5af56 100644
--- 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: