set default values for PULL_PULL_SHA and PULL_BASE_REF to

capm3_release_branch value

Change-Id: I632bdc9a1f2040855b1c766970851b16186799df
Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>

diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index ead55d191becd29e19b49a8f28e9f9a2c4e5d808..80292e8d22bd0a528359771b42e5892c03ff84a3 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -48,11 +48,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

diff --git a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index a08edf085e0154205e42e781c6069b74a90427d0..d5352105be8461e783086f014470946bcefa4d74 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_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

diff --git a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
index a543280cd651a9f951f5d9646adfcb4ff608e8b8..43c49bb6d0a8f079d81a2906ebd91f687f510a50 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_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

diff --git a/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
index 31778d366bb480d76c2ed88f42594fa710ebd5c1..6b6f93272c6770a5f1cf3ad3422da1a389dccd4e 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_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

diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
index 6146efa3d7822570fe410aefdf92d0fabe8d9880..7b53f1e80a7d606abaab189fad5e7cb4d53d4bb6 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_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

diff --git a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
index 7725ad173addf50c14a8311499cdf1b28a066479..801801eea1b570b9f69f50d09a9310183f8709d4 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_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
@@ -66,11 +66,11 @@
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: capm3_release_branch
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: bmo_release_branch
-        default: 'main'
+        default: '{bmo_release_branch}'
         description: 'The target branch of BMO to be used for this test'
     - string:
         name: TARGET_NODE_MEMORY

diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
index e85256eb89eb508a5f800656a20a250459bf690c..8ab6e7a87f48d9cbb5e22329f3fb1a89c03ea7c9 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_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

diff --git a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index 23895865099e7b28980ecd0730694886927a6b6e..88ad06b4202d715aacb069d8fc0f3917cf253be9 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_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
@@ -66,11 +66,11 @@
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: capm3_release_branch
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: bmo_release_branch
-        default: 'main'
+        default: '{bmo_release_branch}'
         description: 'The target branch of BMO to be used for this test'
     - string:
         name: TARGET_NODE_MEMORY

diff --git a/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml
index 8c7cef7778488876369d92433d9c424c32c40c91..980acb456632b036c984df9df3f887c0a14d77e0 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_feature_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

diff --git a/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
index d2cd586650286a62c81776f5b0b8cd97f2425b1d..2defcad57e41581422380bdbfd24d23a89b01b4c 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_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

diff --git a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
index ba7704994f76046a78e5893b286c5ab5385d991e..b3164c801f5cf7565608ee0688fce17cffd2d964 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_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