Metal3: Change branch for dev-tools master -> main

Change-Id: I9fe77779d055290a0cb4972f6822b27a7565284e

diff --git a/jjb/metal3/job_artifact_cleanup.yml b/jjb/metal3/job_artifact_cleanup.yml
index ddc813d9785655f79dbdb6080b9e42e0a5dc4ecf..06830af84545016903212bf2be49dbe55d80c1ca 100644 (file)
--- 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 c6c8f41b5a955cf676390df53535de11b271187c..2e5543dd60a3baa58ae3964c63b2c346ffec8596 100644 (file)
--- 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 1dd9d52a4881ba2756309bd3b5faf5ee672ef79e..231d22734ee02eb65b1028d710c50a3884a12d8b 100644 (file)
--- 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 793217cb38f6d424e966623e02f38c3d654576f3..48d1083e193e6eccef29c29e9d3eb5b3a6d986c0 100644 (file)
--- 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 fbcc72400f7f79fc061d8992deaad7bb33ab0113..2fc887f11059145c9c9bd4754402df72433ea8e6 100644 (file)
--- 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 9743b2443f371fe09701a4b3407f8d32b0f6f359..52108557e4b6b8c4d6e969a4f683f18be20c0c2e 100644 (file)
--- 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 05eec4e8302798e2400a3d55a367230188066a8a..8860cd439539ecab21fee89aab8b4f229ad52df4 100644 (file)
--- 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 6c26c8cfdb36a5c5ae348e991cfc5b2cb166775b..05b8653c449439af60056065132f1a7737afe483 100644 (file)
--- 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 e3ad1f8434acae707038e96e448f06070c49ef5d..2e2edb7401425a57f4cbefa7fa67c7875baf0414 100644 (file)
--- 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