The bleeding edge branch on the arvados repo is now called 'main'.

refs #17817

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/git/hooks/coding-standards.rb b/git/hooks/coding-standards.rb
index 14fb158f41f43bc6bfeabd59d7e5ca8a91147c84..62c210f63a47b33a14fbdaa62655636451442d25 100755 (executable)
--- a/git/hooks/coding-standards.rb
+++ b/git/hooks/coding-standards.rb
@@ -54,8 +54,8 @@ puts "(#{$refname}) (#{$oldrev[0,6]}) (#{$newrev[0,6]})"
 $regex = /\[ref: (\d+)\]/
 
 $broken_commit_message = /Please enter a commit message to explain why this merge is necessary/
-$wrong_way_merge_main = /Merge( remote-tracking)? branch '([^\/]+\/)?master' into/
-$merge_main = /Merge branch '[^']+'((?! into)| into master)/
+$wrong_way_merge_main = /Merge( remote-tracking)? branch '([^\/]+\/)?main' into/
+$merge_main = /Merge branch '[^']+'((?! into)| into main)/
 $pull_merge = /Merge branch 'main' of /
 $refs_or_closes_or_no_issue = /(refs #|closes #|fixes #|no issue #)/i
 
@@ -86,7 +86,7 @@ def check_message_format
       no_ff = true
     elsif $pull_merge.match(message)
       puts "\n[POLICY] This appears to be a git pull merge of remote main into local"
-      puts "main.  In order to maintain a linear first-parent history of master,"
+      puts "main.  In order to maintain a linear first-parent history of main,"
       puts "please reset your branch and remerge or rebase using the latest main.\n"
       puts "\n******************************************************************\n"
       puts "\nOffending commit: #{rev}\n"

diff --git a/jenkins/run-delete-merged-branches.sh b/jenkins/run-delete-merged-branches.sh
index c2ecacb92201e809d5b221de59d189b73ee4bd1e..fdab8e6ace47e3d202e4a52fba6b3c10b76d1129 100755 (executable)
--- a/jenkins/run-delete-merged-branches.sh
+++ b/jenkins/run-delete-merged-branches.sh
@@ -23,7 +23,7 @@ trap '_exit_handler $LINENO' EXIT ERR
 branches_to_keep="master|main|integration|dev|staging|.*\-dev"
 
 git remote update --prune
-git checkout master
+git checkout main
 git pull
 
 git branch --remote --merged | \

diff --git a/jenkins/run-diagnostics-suite.sh b/jenkins/run-diagnostics-suite.sh
index c2b9bb4558fb461be2b8af0b85592550409d4756..c7aaa9fdd8f2d7b5314c1759708440457e56a12d 100755 (executable)
--- a/jenkins/run-diagnostics-suite.sh
+++ b/jenkins/run-diagnostics-suite.sh
@@ -89,7 +89,7 @@ fi
 ECODE=$?
 
 if [[ "$REVISION" != '' ]]; then
-  git checkout master
+  git checkout main
 fi
 
 if [[ "$ECODE" != "0" ]]; then

diff --git a/jenkins/run-performance-suite.sh b/jenkins/run-performance-suite.sh
index e5c80930105d5b09db1a44502c8712d2bbd283ba..24061b6964ec9c70b5e9c10e9c529eccd0e7fde2 100755 (executable)
--- a/jenkins/run-performance-suite.sh
+++ b/jenkins/run-performance-suite.sh
@@ -86,7 +86,7 @@ RAILS_ENV=performance bundle exec rake test:benchmark
 ECODE=$?
 
 if [[ "$REVISION" != '' ]]; then
-  git checkout master
+  git checkout main
 fi
 
 if [[ "$ECODE" != "0" ]]; then