Merge branch 'master' into version_post_ionic

jenkins-scripts/dsl/_configs_/OSRFLinuxBackportPkg.groovy

@@ -40,6 +40,7 @@ class OSRFLinuxBackportPkg
 
       logRotator {
         artifactNumToKeep(20)
+        numToKeep(75)
       }
 
       parameters {

jenkins-scripts/dsl/brew_release.dsl

@@ -145,6 +145,7 @@ bottle_job_builder.with
 
    logRotator {
      artifactNumToKeep(10)
+     numToKeep(75)
    }
 
    axes {

jenkins-scripts/dsl/debian.dsl

@@ -105,6 +105,7 @@ ratt_pkg_job.with
 
   logRotator {
     artifactNumToKeep(10)
+    numToKeep(75)
   }
 
   concurrentBuild(true)

jenkins-scripts/dsl/dsl_checks.bash

@@ -63,8 +63,6 @@ if [[ -n ${empty_branches_on_github_triggered} ]]; then
   exit 1
 fi
 
-# re-enable after https://github.com/gazebo-tooling/release-tools/issues/1095
-
 # Filter out the previous auto jobs
 filtered_dir=$(mktemp -d)
 cp -- *-abichecker-*.xml "${filtered_dir}"
@@ -76,3 +74,10 @@ if [[ -n ${repeated} ]]; then
    echo "please exclude one of the versions in the yaml file to reduce the server workload"
    exit 1
 fi
+
+avoid_infinite_build_archive=$(grep '<numToKeep>-1</numToKeep>' -- *.xml || true)
+if [[ -n ${avoid_infinite_build_archive} ]]; then
+  echo "Found a job setup to keep infinite number of builds. This is BAD"
+  echo "${avoid_infinite_build_archive}"
+  exit 1
+fi

jenkins-scripts/dsl/extra.dsl

@@ -79,6 +79,7 @@ gbp_repo_debbuilds.each { software ->
 
     logRotator {
       artifactNumToKeep(10)
+      numToKeep(75)
     }
 
     concurrentBuild(true)

jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash

@@ -24,7 +24,7 @@ export HOMEBREW_PREFIX=/usr/local
 export HOMEBREW_CELLAR=${HOMEBREW_PREFIX}/Cellar
 export PATH=${HOMEBREW_PREFIX}/bin:${HOMEBREW_PREFIX}/sbin:$PATH
 
-export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python
+export PYTHONPATH=$PYTHONPATH:${HOMEBREW_PREFIX}/lib/python
 
 # make verbose mode?
 MAKE_VERBOSE_STR=""
@@ -90,15 +90,15 @@ if [[ -n "${PIP_PACKAGES_NEEDED}" ]]; then
   brew install python3
   PIP=pip3
   if ! which ${PIP}; then
-    PIP=/usr/local/opt/python/bin/pip3
+    PIP=${HOMEBREW_PREFIX}/opt/python/bin/pip3
   fi
   # TODO use a python3 venv instead.
   ${PIP} install --break-system-packages ${PIP_PACKAGES_NEEDED}
 fi
 
 if [[ -z "${DISABLE_CCACHE}" ]]; then
   brew install ccache
-  export PATH=/usr/local/opt/ccache/libexec:$PATH
+  export PATH=${HOMEBREW_PREFIX}/opt/ccache/libexec:$PATH
 fi
 echo '# END SECTION'
 
@@ -123,33 +123,33 @@ export DISPLAY=$(ps ax \
 CMAKE_ARGS=""
 # set CMAKE_PREFIX_PATH if we are using qt@5
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'qt@5' }.empty?"; then
-  export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/qt@5
+  export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${HOMEBREW_PREFIX}/opt/qt@5
 fi
 # set cmake args if we are using qwt-qt5
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'qwt-qt5' }.empty?"; then
-  CMAKE_ARGS="${CMAKE_ARGS} -DQWT_WIN_INCLUDE_DIR=/usr/local/opt/qwt-qt5/lib/qwt.framework/Headers -DQWT_WIN_LIBRARY_DIR=/usr/local/opt/qwt-qt5/lib"
+  CMAKE_ARGS="${CMAKE_ARGS} -DQWT_WIN_INCLUDE_DIR=${HOMEBREW_PREFIX}/opt/qwt-qt5/lib/qwt.framework/Headers -DQWT_WIN_LIBRARY_DIR=${HOMEBREW_PREFIX}/opt/qwt-qt5/lib"
 fi
 # Workaround for [email protected]: set PATH
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/[email protected]' }.empty?"; then
-  export PATH=/usr/local/opt/[email protected]/bin:${PATH}
+  export PATH=${HOMEBREW_PREFIX}/opt/[email protected]/bin:${PATH}
 fi
 # Workaround for ffmpeg 4: set PKG_CONFIG_PATH if we are using ffmpeg@4
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/ffmpeg@4' }.empty?"; then
-  export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/ffmpeg@4/lib/pkgconfig
+  export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${HOMEBREW_PREFIX}/opt/ffmpeg@4/lib/pkgconfig
 fi
 # Workaround for tbb@2020_u3: set CPATH, LIBRARY_PATH, and CMAKE_PREFIX_PATH
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/tbb@2020_u3' }.empty?"; then
-  export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/tbb@2020_u3
-  export CPATH=${CPATH}:/usr/local/opt/tbb@2020_u3/include
-  export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/tbb@2020_u3/lib
+  export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${HOMEBREW_PREFIX}/opt/tbb@2020_u3
+  export CPATH=${CPATH}:${HOMEBREW_PREFIX}/opt/tbb@2020_u3/include
+  export LIBRARY_PATH=${LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/tbb@2020_u3/lib
 fi
 # if we are using gts, need to add gettext library path since it is keg-only
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'gettext' }.empty?"; then
-  export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/gettext/lib
+  export LIBRARY_PATH=${LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/gettext/lib
 fi
 # if we are using boost, need to add icu4c library path since it is keg-only
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'icu4c' }.empty?"; then
-  export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/icu4c/lib
+  export LIBRARY_PATH=${LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/icu4c/lib
 fi
 # set Python3_EXECUTABLE if this homebrew formula defines the python_cmake_arg method
 if brew ruby -e "exit '${PROJECT_FORMULA}'.f.respond_to?(:python_cmake_arg)"; then
@@ -158,13 +158,13 @@ fi
 
 # if we are using [email protected] (custom OR port), need to add dartsim library path since it is keg-only
 if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'osrf/simulation/[email protected]' }.empty?"; then
-  export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/[email protected]
-  export DYLD_FALLBACK_LIBRARY_PATH=${DYLD_FALLBACK_LIBRARY_PATH}:/usr/local/opt/[email protected]/lib:/usr/local/opt/octomap/local
-  export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/[email protected]/lib/pkgconfig
+  export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${HOMEBREW_PREFIX}/opt/[email protected]
+  export DYLD_FALLBACK_LIBRARY_PATH=${DYLD_FALLBACK_LIBRARY_PATH}:${HOMEBREW_PREFIX}/opt/[email protected]/lib:${HOMEBREW_PREFIX}/opt/octomap/local
+  export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${HOMEBREW_PREFIX}/opt/[email protected]/lib/pkgconfig
 fi
 
 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-      -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/${PROJECT_FORMULA}/HEAD \
+      -DCMAKE_INSTALL_PREFIX=${HOMEBREW_PREFIX}/Cellar/${PROJECT_FORMULA}/HEAD \
      ${CMAKE_ARGS} \
      ${WORKSPACE}/${PROJECT_PATH}
 echo '# END SECTION'

release.py

@@ -558,8 +558,8 @@ def get_vendor_github_repo(package_name) -> str:
 def get_vendor_repo_url(package_name) -> str:
     # Clone needs ssh for real pushing operations. In simulation prefer https to avoid
     # unexpected pushes and facilitate testing
-    protocol = 'https://github.com/' if DRY_RUN else 'ssh://[email protected]:'
-    return f"{protocol}{get_vendor_github_repo(package_name)}"
+    protocol = 'https://github.com' if DRY_RUN else 'ssh://[email protected]'
+    return f"{protocol}/{get_vendor_github_repo(package_name)}"
 
 
 def prepare_vendor_pr_temp_workspace(package_name, ws_dir) -> Tuple[str, str, str]: