Merge branch 'master' into jrivero/yaml_debbuilders

gazebo-tooling · Jan 10, 2024 · cec53e4 · cec53e4
2 parents a33d65e + 7250033
commit cec53e4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/bloom/ros_gz/README.md b/bloom/ros_gz/README.md
@@ -33,7 +33,8 @@ newer version of Gazebo than the one selected in REP-2000.
 | ---------------|---------------------|------------|---------------|---------------------|----|-------------|
 | Garden         | Humble              | stable     | humble        | https://github.com/gazebo-release/ros_ign-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64/) | <details>```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_ign-release ./bloom_from_special_env.bash humble garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list```</details> |
 | Garden         | Iron                | stable     | iron          | https://github.com/gazebo-release/ros_ign-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64/) | <details>```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_ign-release ./bloom_from_special_env.bash iron garden https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_garden/00-replace-gz-fortress-with-garden.list```</details> |
-| Harmonic       | Iron                | stable     | ros2          | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) | <details>```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release   ./bloom_from_special_env.bash iron harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep```</details> |
+| Harmonic       | Humble              | stable     | humble        | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64/) | <details>```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash hubmle harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep/master/gz/replace_fortress_with_harmonic/00-replace-gz-fortress-with-harmonic.list```</details> |
+| Harmonic       | Iron                | stable     | ros2          | https://github.com/gazebo-release/ros_gz-gzharmonic-release | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64)](https://build.osrfoundation.org/job/ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64/) | <details>```RELEASE_REPO_URL=https://github.com/gazebo-release/ros_gz-gzharmonic-release ./bloom_from_special_env.bash iron harmonic https://raw.githubusercontent.com/osrf/osrf-rosdep```</details> |
 
 ### Upstream versions released using this tutorial
 

diff --git a/jenkins-scripts/dsl/core.dsl b/jenkins-scripts/dsl/core.dsl
@@ -63,6 +63,8 @@ reprepro.with
   {
     stringParam('UPLOAD_TO_REPO','ubuntu-testing',
                 'Repository to host the new imported packages. Should match entry in reprepro.ini')
+    stringParam('REPREPRO_GIT_BRANCH', '',
+                'Branch of the repository to be used for code and REPREPRO_IMPORT_YAML_FILE (empty implies uses default)')
     stringParam('REPREPRO_IMPORT_YAML_FILE','',
                 'Name of the reprepo import file')
     booleanParam('COMMIT',false,

diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt
@@ -486,4 +486,5 @@ install_ci ionic sdformat15-install-pkg-jammy-amd64
 install_ci ionic sdformat15-install_bottle-homebrew-amd64
 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_humble-ci-jammy-amd64
 unofficial_wrappers_install_pkg_ci garden ros_gzgarden_bridge-install-pkg_iron-ci-jammy-amd64
+unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64
 unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64
diff --git a/jenkins-scripts/dsl/ros_gz_bridge.dsl b/jenkins-scripts/dsl/ros_gz_bridge.dsl
@@ -19,7 +19,7 @@ def gzgarden_ros_distros_ci = [
 
 def unofficial_combinations = [
   'garden' : ['humble', 'iron'],
-  'harmonic' : ['iron']
+  'harmonic' : ['humble', 'iron']
 ]
 
 logging_list = [:]

diff --git a/jenkins-scripts/lib/homebrew_bottle_creation.bash b/jenkins-scripts/lib/homebrew_bottle_creation.bash
@@ -113,7 +113,7 @@ for j in $(ls *.bottle.json); do
   SRC_BOTTLE=$(brew ruby -e \
     "puts JSON.load(IO.read(\"${j}\")).values[0]['bottle']['tags'].values[0]['local_filename']")
   DEST_BOTTLE=$(brew ruby -e \
-    "puts URI.decode(JSON.load(IO.read(\"${j}\")).values[0]['bottle']['tags'].values[0]['filename'])")
+    "puts URI::DEFAULT_PARSER.unescape(JSON.load(IO.read(\"${j}\")).values[0]['bottle']['tags'].values[0]['filename'])")
   mv ${SRC_BOTTLE} ${DEST_BOTTLE}
 done
 mv *.bottle*.tar.gz ${PKG_DIR}

diff --git a/release.py b/release.py
@@ -169,6 +169,8 @@ def parse_args(argv):
         args.package = args.package.replace('ign-', 'gz-')
 
     args.package_alias = args.package
+    if args.package.startswith('ign-'):
+        args.package_alias = args.package.replace('ign-', 'ignition-')
 
     DRY_RUN = args.dry_run
     if args.upload_to_repository == 'nightly':