Merge "Add main e2e upgrade test job"

diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index 582e3d3bd6cc642f4a1a81f1c1f7b25ae1204ace..8fca3f709bb3f9c357bdf5525772ad0681fb2e09 100644 (file)
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,7 +52,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS

diff --git a/jjb/metal3/job_capm3_e2e_tests.yml b/jjb/metal3/job_capm3_e2e_tests.yml
index ddf801a3424d5d3425e84d634581961368ffd41a..d5eb963a0ab86b98c9ebf29b06336377ff4d740d 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_tests.yml
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS

diff --git a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
index b02651b559d2ae5120249a9034716ec961d6439e..2014a479f6298bc5c31959a2d2a4d22ea8df14cb 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_upgrade_tests.yml
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
@@ -102,7 +102,6 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'master'
           - 'main'
         status-context: "test-v1b1-upgrade-e2e"
         success-status: "Passed"

diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml
index 1221a8ba1b14f608169de851dcd008371f763ddd..19d8b5277a29cefb6075d099aa4471a7abb3cf57 100644 (file)
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_integration_tests.yml
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS

diff --git a/jjb/metal3/job_feature_tests.yml b/jjb/metal3/job_feature_tests.yml
index 4aba1085c7217d24fa643018381a1ca55eecb216..94fdc40599613e9973c09bbe5c920a9ede8680dc 100644 (file)
--- a/jjb/metal3/job_feature_tests.yml
+++ b/jjb/metal3/job_feature_tests.yml
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
@@ -102,7 +102,6 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'master'
           - 'main'
           - 'release-0.5'
           - 'release-0.1'

diff --git a/jjb/metal3/job_feature_tests_upgrade.yml b/jjb/metal3/job_feature_tests_upgrade.yml
index fb44f5b2f3e675dff3009a5573b3117c2a10d274..5d0a0082ef116f46b1cd91f53051932e646f9de6 100644 (file)
--- a/jjb/metal3/job_feature_tests_upgrade.yml
+++ b/jjb/metal3/job_feature_tests_upgrade.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,7 +52,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS
@@ -109,7 +109,6 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'master'
           - 'main'
           - 'release-0.5'
           - 'release-0.1'

diff --git a/jjb/metal3/job_ipa_image_building_test.yml b/jjb/metal3/job_ipa_image_building_test.yml
index cf22253f475bd11c2a7bc9e32a71932c7b3a1d6e..5a4f76a4ba01b1d764fc2904eaef646d0b5d1445 100644 (file)
--- a/jjb/metal3/job_ipa_image_building_test.yml
+++ b/jjb/metal3/job_ipa_image_building_test.yml
@@ -75,7 +75,7 @@
         description: 'Ironic Python Agent builder repository tool commit'
     - string:
         name: METAL3_DEV_ENV_BRANCH
-        default: 'master'
+        default: 'main'
         description: 'Metal3 dev env repository branch'
     - string:
         name: METAL3_DEV_ENV_COMMIT
@@ -99,7 +99,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: STAGING

diff --git a/jjb/metal3/job_main_feature_tests.yml b/jjb/metal3/job_main_feature_tests.yml
index bd0a15666ca21618de992f1ab44480d0a4601312..4bead63c870bc456940dc44b01441ddad809ae42 100644 (file)
--- a/jjb/metal3/job_main_feature_tests.yml
+++ b/jjb/metal3/job_main_feature_tests.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,7 +52,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS

diff --git a/jjb/metal3/job_main_feature_tests_upgrade.yml b/jjb/metal3/job_main_feature_tests_upgrade.yml
index f7cd89575565578d9e7672a59cdd33ff6e9c5b1c..27a39d6959317d70491e4765ce906b4f1eb6ef14 100644 (file)
--- a/jjb/metal3/job_main_feature_tests_upgrade.yml
+++ b/jjb/metal3/job_main_feature_tests_upgrade.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,7 +52,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS

diff --git a/jjb/metal3/job_main_ipa_image_building.yml b/jjb/metal3/job_main_ipa_image_building.yml
index 126419b354e03d8f552dd8412fc5f118c3183142..6bfc4fc4ef9f6881a5c1d738852654d644904a35 100644 (file)
--- a/jjb/metal3/job_main_ipa_image_building.yml
+++ b/jjb/metal3/job_main_ipa_image_building.yml
@@ -75,7 +75,7 @@
         description: 'Ironic Python Agent builder repository tool commit'
     - string:
         name: METAL3_DEV_ENV_BRANCH
-        default: 'master'
+        default: 'main'
         description: 'Metal3 dev env repository branch'
     - string:
         name: METAL3_DEV_ENV_COMMIT

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 5989f00d49b9766b4ee6d7cb1c1b4b9321a13f51..dba00df5b22b7cfef13cbfd6968e6a48405fab8d 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -79,13 +79,11 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
-            - 'master'
             - 'main'
       - v1a5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
-            - 'master'
             - 'main'
             - 'release-0.5'
             - 'release-0.1'
@@ -93,7 +91,6 @@
           capi_version: v1alpha3
           capm3_version: v1alpha4
           target_branches:
-            - 'master'
             - 'main'
             - 'release-0.4'
             - 'release-0.0'
@@ -133,13 +130,11 @@
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
-            - 'master'
             - 'main'
       - v1a5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
-            - 'master'
             - 'main'
             - 'release-0.5'
             - 'release-0.1'
@@ -237,13 +232,11 @@
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 target_branches:
-                  - 'master'
                   - 'main'
             - v1a5:
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 target_branches:
-                  - 'master'
                   - 'main'
                   - 'release-0.5'
       - capm3_main_e2e_upgrade_tests: