Merge "Fix daily test default capm3 branches"

diff --git a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml b/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
index 65f9520c6faa7511f59fa319587f59a0f55ee127..22946c8ef1b01eec2590071e3fad0dfeee688617 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
@@ -50,11 +50,11 @@
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER

diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
index 459099a47e02cef99ece3d2b277e6e63dce10169..ad834a51dfef1a7998934da6d74e2e74f8acf266 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
@@ -50,11 +50,11 @@
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER