From 3da8750b4987d1da2fbb4f85c035e17fec398fcf Mon Sep 17 00:00:00 2001 From: kashifest Date: Tue, 8 Mar 2022 13:06:32 +0200 Subject: [PATCH] Replace master branch reference with main Metal3-dev-env is also defaulting to main branch. This PR makes sure the master branch reference is properly updated. Change-Id: I3f0714184f8af5d06e1a214a0fc0eca01c0ae867 --- jjb/metal3/job_bml_integration_tests.yml | 4 ++-- jjb/metal3/job_capm3_e2e_tests.yml | 4 ++-- jjb/metal3/job_capm3_e2e_upgrade_tests.yml | 5 ++--- jjb/metal3/job_capm3_main_integration_tests.yml | 4 ++-- jjb/metal3/job_feature_tests.yml | 5 ++--- jjb/metal3/job_feature_tests_upgrade.yml | 5 ++--- jjb/metal3/job_ipa_image_building_test.yml | 4 ++-- jjb/metal3/job_main_feature_tests.yml | 4 ++-- jjb/metal3/job_main_feature_tests_upgrade.yml | 4 ++-- jjb/metal3/job_main_ipa_image_building.yml | 2 +- jjb/metal3/projects.yml | 7 ------- 11 files changed, 19 insertions(+), 29 deletions(-) diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml index 582e3d3bd..8fca3f709 100644 --- 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 ddf801a34..d5eb963a0 100644 --- 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 b02651b55..2014a479f 100644 --- 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 1221a8ba1..19d8b5277 100644 --- 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 4aba1085c..94fdc4059 100644 --- 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 fb44f5b2f..5d0a0082e 100644 --- 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 cf22253f4..5a4f76a4b 100644 --- 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 bd0a15666..4bead63c8 100644 --- 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 f7cd89575..27a39d695 100644 --- 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 126419b35..6bfc4fc4e 100644 --- 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 5011f3a21..1da90351f 100644 --- 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_tests: -- 2.25.1