From 08acaf063c6285721f4b71840b6a43f429191789 Mon Sep 17 00:00:00 2001 From: Lennart Jern Date: Fri, 1 Jul 2022 11:21:13 +0300 Subject: [PATCH] Metal3: Change branch for dev-tools master -> main Change-Id: I9fe77779d055290a0cb4972f6822b27a7565284e --- jjb/metal3/job_artifact_cleanup.yml | 2 +- jjb/metal3/job_docker_image_building.yml | 4 ++-- jjb/metal3/job_ipa_image_building_test.yml | 5 ++--- jjb/metal3/job_linter_tests.yml | 5 ++--- jjb/metal3/job_main_ipa_image_building.yml | 2 +- jjb/metal3/job_metal3_dev_tools_integration_test.yml | 7 +++---- jjb/metal3/job_openstack_image_building.yml | 2 +- jjb/metal3/job_openstack_node_image_building.yml | 2 +- jjb/metal3/job_update_nordix_repos.yml | 2 +- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/jjb/metal3/job_artifact_cleanup.yml b/jjb/metal3/job_artifact_cleanup.yml index ddc813d97..06830af84 100644 --- a/jjb/metal3/job_artifact_cleanup.yml +++ b/jjb/metal3/job_artifact_cleanup.yml @@ -49,7 +49,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - 'master' + - 'main' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_docker_image_building.yml b/jjb/metal3/job_docker_image_building.yml index c6c8f41b5..2e5543dd6 100644 --- a/jjb/metal3/job_docker_image_building.yml +++ b/jjb/metal3/job_docker_image_building.yml @@ -35,7 +35,7 @@ parameters: - string: name: ghprbActualCommit - default: 'master' + default: 'main' description: 'CI Repo branch for triggering manual build' properties: @@ -54,7 +54,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - '{branch|master}' + - '{branch|main}' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_ipa_image_building_test.yml b/jjb/metal3/job_ipa_image_building_test.yml index 1dd9d52a4..231d22734 100644 --- a/jjb/metal3/job_ipa_image_building_test.yml +++ b/jjb/metal3/job_ipa_image_building_test.yml @@ -91,7 +91,7 @@ description: 'Project github repo name' - string: name: ghprbActualCommit - default: 'master' + default: 'main' description: 'CI Repo branch for triggering manual build' - string: name: ghprbAuthorRepoGitUrl @@ -130,7 +130,6 @@ auto-close-on-fail: False allow-whitelist-orgs-as-admins: True white-list-target-branches: - - 'master' - 'main' status-context: "test-ipa" success-status: "Passed" @@ -143,7 +142,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - '{branch|master}' + - '{branch|main}' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_linter_tests.yml b/jjb/metal3/job_linter_tests.yml index 793217cb3..48d1083e1 100644 --- a/jjb/metal3/job_linter_tests.yml +++ b/jjb/metal3/job_linter_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: IMAGE_OS @@ -73,7 +73,6 @@ auto-close-on-fail: False allow-whitelist-orgs-as-admins: True white-list-target-branches: - - master - main status-context: "linter-tests" success-status: "Passed" @@ -86,7 +85,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - '{branch|master}' + - '{branch|main}' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_main_ipa_image_building.yml b/jjb/metal3/job_main_ipa_image_building.yml index fbcc72400..2fc887f11 100644 --- a/jjb/metal3/job_main_ipa_image_building.yml +++ b/jjb/metal3/job_main_ipa_image_building.yml @@ -105,7 +105,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - 'master' + - 'main' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml index 9743b2443..52108557e 100644 --- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml +++ b/jjb/metal3/job_metal3_dev_tools_integration_test.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 @@ -99,7 +99,6 @@ auto-close-on-fail: False allow-whitelist-orgs-as-admins: True white-list-target-branches: - - 'master' - 'main' status-context: "test-integration-metal3-dev-tools-{image_os}" success-status: "Passed" @@ -112,7 +111,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - '{branch|master}' + - '{branch|main}' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml index 05eec4e83..8860cd439 100644 --- a/jjb/metal3/job_openstack_image_building.yml +++ b/jjb/metal3/job_openstack_image_building.yml @@ -58,7 +58,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - 'master' + - 'main' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_openstack_node_image_building.yml b/jjb/metal3/job_openstack_node_image_building.yml index 6c26c8cfd..05b8653c4 100644 --- a/jjb/metal3/job_openstack_node_image_building.yml +++ b/jjb/metal3/job_openstack_node_image_building.yml @@ -55,7 +55,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - 'master' + - 'main' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True diff --git a/jjb/metal3/job_update_nordix_repos.yml b/jjb/metal3/job_update_nordix_repos.yml index e3ad1f843..2e2edb740 100644 --- a/jjb/metal3/job_update_nordix_repos.yml +++ b/jjb/metal3/job_update_nordix_repos.yml @@ -49,7 +49,7 @@ url: "{ci_github_repo}" credentials-id: "{ci_github_jenkins_credentials_id}" branches: - - 'master' + - 'main' name: 'origin' refspec: '+refs/heads/*:refs/remotes/origin/*' wipe-workspace: True -- 2.25.1