Use stable branches for gz-sensors and gz-transport in harmonic (#997)

* Use stable branches for gz-sensors and gz-transport inharmonic --------- Signed-off-by: Ian Chen <[email protected]>
gazebo-tooling · Aug 30, 2023 · 5a99a86 · 5a99a86
1 parent 0bc3136
commit 5a99a86
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
@@ -89,15 +89,15 @@ collections:
       - name: gz-transport
         major_version: 13
         repo:
-          current_branch: main
+          current_branch: gz-transport13
       - name: gz-gui
         major_version: 8
         repo:
           current_branch: main
       - name: gz-sensors
         major_version: 8
         repo:
-          current_branch: main
+          current_branch: gz-sensors8
       - name: gz-physics
         major_version: 7
         repo:

diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl
@@ -70,11 +70,11 @@ gz_branches                 = [ 'cmake'      : [ '3' ],
                                 'msgs'       : [ '9', '10'],
                                 'physics'    : [ '6' ],
                                 'plugin'     : [ '2' ],
-                                'rendering'  : [ '7' , '8'],
-                                'sensors'    : [ '7' ],
+                                'rendering'  : [ '7', '8' ],
+                                'sensors'    : [ '7', '8' ],
                                 'sim'        : [ '7' ],
                                 'tools'      : [ '2' ],
-                                'transport'  : [ '12' ],
+                                'transport'  : [ '12', '13' ],
                                 'utils'      : [ '2' ]]
 // DESC: prerelease branches are managed as any other supported branches for
 // special cases different to major branches: get compilation CI on the branch
@@ -86,9 +86,7 @@ gz_prerelease_branches = []
 gz_extra_debbuild = [ 'gui8',
                       'launch7',
                       'physics7',
-                      'sensors8',
                       'sim8',
-                      'transport13',
                       'utils1' // see comment https://github.com/gazebo-tooling/release-tools/pull/431#issuecomment-815099918
                     ]
 // DESC: exclude ignition from generate any install testing job

diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl
@@ -286,7 +286,7 @@ gz_collection_jobs =
         'ign_physics-gz-6-win',
         'ign_plugin-gz-2-win',
         'ign_rendering-gz-8-win',
-        'ign_sensors-ci-win',
+        'ign_sensors-gz-8-win',
         'ign_tools-gz-2-win',
         'ign_transport-gz-13-win',
         'ign_utils-gz-2-win',
@@ -300,10 +300,10 @@ gz_collection_jobs =
         'gz_physics-ci-gz-physics6-jammy-amd64',
         'gz_plugin-ci-gz-plugin2-jammy-amd64',
         'gz_rendering-ci-gz-rendering8-jammy-amd64',
-        'gz_sensors-ci-main-jammy-amd64',
+        'gz_sensors-ci-gz-sensors8-jammy-amd64',
         'gz_sim-ci-main-jammy-amd64',
         'gz_tools-ci-gz-tools2-jammy-amd64',
-        'gz_transport-ci-main-jammy-amd64',
+        'gz_transport-ci-gz-transport13-jammy-amd64',
         'gz_utils-ci-gz-utils2-jammy-amd64',
         'ignition_cmake-ci-gz-cmake3-homebrew-amd64',
         'ignition_common-ci-gz-common5-homebrew-amd64',
@@ -317,7 +317,7 @@ gz_collection_jobs =
         'ignition_physics-ci-gz-physics6-homebrew-amd64',
         'ignition_plugin-ci-gz-plugin2-homebrew-amd64',
         'ignition_rendering-ci-gz-rendering8-homebrew-amd64',
-        'ignition_sensors-ci-main-homebrew-amd64',
+        'ignition_sensors-ci-gz-sensors8-homebrew-amd64',
         'ignition_tools-ci-gz-tools2-homebrew-amd64',
         'ignition_transport-ci-gz-transport13-homebrew-amd64',
         'ignition_utils-ci-gz-utils2-homebrew-amd64',