Merge branch 'master' into jrivero/cleanup_gzdev

gazebo-tooling · Nov 6, 2024 · bf459e3 · bf459e3
2 parents 789c570 + a4af439
commit bf459e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 94 deletions.
diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash
@@ -179,8 +179,8 @@ fi
 # The redirection fails too many times using us ftp
 if [[ ${LINUX_DISTRO} == 'debian' ]]; then
 cat >> Dockerfile << DELIM_DEBIAN_APT
-  RUN sed -i -e 's:httpredir:ftp.us:g' /etc/apt/sources.list
-  RUN echo "deb-src ${SOURCE_LIST_URL} ${DISTRO} main" >> /etc/apt/sources.list
+  RUN sed -i -e 's/URIs: .*/URIs: http:\/\/ftp.us.debian.org\/debian/g' /etc/apt/sources.list.d/debian.sources
+  RUN sed -i -e 's/Types: deb/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources
 DELIM_DEBIAN_APT
 fi
 
@@ -326,17 +326,6 @@ RUN (apt-get update || (rm -rf /var/lib/apt/lists/* && apt-get update)) \
 RUN mkdir -p ${WORKSPACE}
 DELIM_DOCKER31
 
-# Beware of moving this code since it needs to run update-alternative after
-# installing the default compiler in PACKAGES_CACHE_AND_CHECK_UPDATES
-if ${INSTALL_C17_COMPILER}; then
-cat >> Dockerfile << DELIM_GCC8
-   RUN apt-get update \\
-   && apt-get install -y g++-8 \\
-   && rm -rf /var/lib/apt/lists/* \\
-   && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8
-DELIM_GCC8
-fi
-
 if ${USE_SQUID}; then
   cat >> Dockerfile << DELIM_DOCKER_SQUID
 # If host is running squid-deb-proxy on port 8000, populate /etc/apt/apt.conf.d/30proxy

diff --git a/jenkins-scripts/dsl/debian.dsl b/jenkins-scripts/dsl/debian.dsl
@@ -2,87 +2,6 @@ import _configs_.*
 import javaposse.jobdsl.dsl.Job
 
 Globals.default_emails = "jrivero@osrfoundation.org"
-
-packages = [:]
-packages['science-team'] = ['console-bridge',
-                            'gazebo',
-                            'fcl',
-                            'ignition-cmake',
-                            'ignition-common',
-                            'ignition-math2',
-                            'ignition-math4',
-                            'ignition-msgs',
-                            'ignition-tools',
-                            'ignition-transport', // version 4
-                            'dart',
-                            'libccd',
-                            'octomap',
-                            'sdformat', // version 6
-                            'simbody',
-                            'urdfdom',
-                            'urdfdom-headers' ]
-
-packages['jrivero-guest'] = ['empy']
-
-
-packages.each { repo_name, pkgs ->
- pkgs.each { pkg ->
-
-  // --------------------------------------------------------------
-  // 2. Create the job that tries to build the package and run lintian
-  def ci_job = job("${pkg}-pkg_builder-master-debian_sid-amd64")
-  OSRFLinuxBuildPkgBase.create(ci_job)
-  ci_job.with
-  {
-     scm {
-        git {
-          remote {
-            url("https://salsa.debian.org/${repo_name}/${pkg}.git")
-          }
-          extensions {
-            cleanBeforeCheckout()
-            relativeTargetDirectory('repo')
-          }
-
-          branch('refs/heads/master')
-        }
-      }
-
-      properties {
-        priority 350
-      }
-
-      parameters {
-        textParam("RELEASE_VERSION", null, "osrfX, OSRF postix version")
-        textParam("RELEASE_ARCH_VERSION", null, "~ARCH-X, release version")
-      }
-
-      steps {
-        shell("""\
-              #!/bin/bash -xe
-
-              export LINUX_DISTRO=debian
-              export DISTRO=sid
-
-              /bin/bash -xe ./scripts/jenkins-scripts/docker/debian-git-debbuild.bash
-              """.stripIndent())
-      }
-
-      publishers
-      {
-         // Added the lintian parser
-         configure { project ->
-           project / publishers << 'hudson.plugins.logparser.LogParserPublisher' {
-              unstableOnWarning true
-              failBuildOnError false
-              parsingRulesPath('/var/lib/jenkins/logparser_lintian')
-           }
-         }
-      }
-    }
-  }
-}
-
 // ratt package to help during transition
 def ratt_pkg_job = job("debian-ratt-builder")
 OSRFLinuxBase.create(ratt_pkg_job)

diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash
@@ -88,10 +88,17 @@ fi
 
 if [[ -n "${PIP_PACKAGES_NEEDED}" ]]; then
   brew install python3
+  # reset command hash since python3 has already been invoked in this script
+  hash -r
   rm -rf ${WORKSPACE}/venv
   python3 -m venv ${WORKSPACE}/venv
   . ${WORKSPACE}/venv/bin/activate
   pip3 install ${PIP_PACKAGES_NEEDED}
+  # For python 3.X, our formulae install python bindings to
+  # ${HOMEBREW_PREFIX}/lib/python3.X/site-packages
+  # so add that folder to PYTHONPATH
+  python_minor_version=$(python3 -c 'import sys; print(sys.version_info[1])')
+  export PYTHONPATH=${HOMEBREW_PREFIX}/lib/python3.$python_minor_version/site-packages:$PYTHONPATH
 fi
 
 if [[ -z "${DISABLE_CCACHE}" ]]; then