remove unusable ironic image parameters

The templating used for these parameters is not woking as the
jenkins is unable to add the "ghprb" data when the job is triggered.

Change-Id: I33d55ff8a35fedeb305396ef5e04d28743e20d41

diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index 12371c397a00cedd2a8a6fa49a841d6505ec914f..ca76832f6c035d57c48142b0478ad18baa8f8964 100644 (file)
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -41,5 +41,3 @@
     ironic_install_type: 'rpm'
     name_postfix: ''
     trigger_postfix: ''
-    ironic_repo: 'https://github.com/metal3-io/ironic-image.git'
-    ironic_branch: 'main'

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index e7234c846eda90e4113b41ee68a42d313d9e1c88..e521497c270be121a8ab3e1acffdba34e213a1ab 100644 (file)
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -73,14 +73,6 @@
         name: IRONIC_INSTALL_TYPE
         default: '{ironic_install_type}'
         description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment'
-    - string:
-        name: IRONIC_LOCAL_IMAGE
-        default: '{ironic_repo}'
-        description: 'In case of ironic-image PR tested with ironic source install, the source repo of the PR  will be used to build the local ironic-image'
-    - string:
-        name: IRONIC_LOCAL_IMAGE_BRANCH
-        default: '{ironic_branch}'
-        description: 'In case of ironic-image PR tested with ironic source install, the source branch of the PR  will be used to build the local ironic-image'
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 9b2ec57f5f714f89568c976470144a5df36559e4..12c339f8f4d4c94f2e55516ae9d11cc45ba16133 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -71,8 +71,6 @@
           repo: ironic-image
           name_postfix: '_ironic_from_source'
           trigger_postfix: '-ironic-source'
-          ironic_repo: '${{ghprbAuthorRepoGitUrl}}'
-          ironic_branch: '${{ghprbActualCommit}}'
           ironic_install_type: 'source'
       - ironic_image:
           repo: ironic-image