Merge branch 'master' into jrivero/abichecker-static-doc

gazebo-tooling · Oct 17, 2023 · 2b0a464 · 2b0a464
2 parents 824eeca + 5a64f14
commit 2b0a464
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
@@ -104,69 +104,69 @@ collections:
   - name: 'fortress'
     libs:
       - name: gz-cmake
-        major_version: 3
+        major_version: 2
         repo:
-          current_branch: gz-cmake2
+          current_branch: ign-cmake2
       - name: gz-tools
         major_version: 1
         repo:
-          current_branch: gz-tools1
+          current_branch: ign-tools1
       - name: gz-utils
         major_version: 1
         repo:
-          current_branch: gz-utils1
+          current_branch: ign-utils1
       - name: gz-math
         major_version: 6
         repo:
-          current_branch: gz-math6
+          current_branch: ign-math6
       - name: gz-plugin
         major_version: 1
         repo:
-          current_branch: gz-plugin1
+          current_branch: ign-plugin1
       - name: gz-common
         major_version: 4
         repo:
-          current_branch: gz-common4
+          current_branch: ign-common4
       - name: gz-msgs
         major_version: 8
         repo:
-          current_branch: gz-msgs8
+          current_branch: ign-msgs8
       - name: gz-rendering
         major_version: 6
         repo:
-          current_branch: gz-rendering6
+          current_branch: ign-rendering6
       - name: sdformat
         major_version: 12
         repo:
           current_branch: sdf12
       - name: gz-fuel-tools
         major_version: 7
         repo:
-          current_branch: gz-fuel-tools7
+          current_branch: ign-fuel-tools7
       - name: gz-transport
         major_version: 11
         repo:
-          current_branch: gz-transport11
+          current_branch: ign-transport11
       - name: gz-gui
         major_version: 6
         repo:
-          current_branch: gz-gui6
+          current_branch: ign-gui6
       - name: gz-sensors
         major_version: 7
         repo:
-          current_branch: gz-sensors7
+          current_branch: ign-sensors7
       - name: gz-physics
         major_version: 6
         repo:
-          current_branch: gz-physics6
+          current_branch: ign-physics6
       - name: gz-sim
         major_version: 6
         repo:
-          current_branch: gz-sim6
+          current_branch: ign-sim6
       - name: gz-launch
         major_version: 5
         repo:
-          current_branch: gz-launch5
+          current_branch: ign-launch5
       - name: gz-fortress
         major_version: 1
         repo:

diff --git a/jenkins-scripts/lib/_homebrew_base_setup.bash b/jenkins-scripts/lib/_homebrew_base_setup.bash
@@ -21,9 +21,9 @@ export HOMEBREW_UPDATE_TO_TAG=1
 # run it several times until it succeeds.
 # See https://github.com/Homebrew/brew/issues/1155
 brew_update_retry_count=0
-until ${BREW_BINARY} update || (( brew_update_retry_count++ > 6 ))
+until ${BREW_BINARY} update || (( brew_update_retry_count++ > 10 ))
 do
-  sleep 10
+  sleep 60
 done
 # manually exclude a ruby warning that jenkins thinks is from clang
 # https://github.com/osrf/homebrew-simulation/issues/1343