Use Jenkinsfile dir for external ex

RobotLocomotion · Oct 29, 2024 · d9d3579 · d9d3579
1 parent 1edf6f5
commit d9d3579
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 20 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -17,11 +17,13 @@ node('linux-jammy-unprovisioned') {
           stage('checkout') {
             checkout scm
           }
+        }
+        dir('src/drake_bazel_external'){
           stage('bazel_external setup') {
-            sh './drake_bazel_external/.github/setup'
+            sh './.github/setup'
           }
           stage('bazel_external build and test') {
-            sh './drake_bazel_external/.github/ci_build_test'
+            sh './.github/ci_build_test'
           }
         }
       } catch (e) {
@@ -58,11 +60,13 @@ node('linux-jammy-unprovisioned') {
           stage('checkout') {
             checkout scm
           }
+        }
+        dir('src/drake_cmake_external'){
           stage('cmake_external setup') {
-            sh './drake_cmake_external/.github/setup'
+            sh './.github/setup'
           }
           stage('cmake_external build and test') {
-            sh './drake_cmake_external/.github/ci_build_test'
+            sh './.github/ci_build_test'
           }
         }
       } catch (e) {

diff --git a/drake_bazel_external/.github/ci_build_test b/drake_bazel_external/.github/ci_build_test
@@ -3,9 +3,5 @@
 
 set -euxo pipefail
 
-pushd drake_bazel_external
-
 bazel version
 bazel test //...
-
-popd
diff --git a/drake_bazel_external/.github/setup b/drake_bazel_external/.github/setup
@@ -3,7 +3,6 @@
 
 set -euxo pipefail
 
-cd $(dirname "${BASH_SOURCE}")
 sudo ./ubuntu_setup
 
 cat > "${HOME}/.bazelrc" << EOF

diff --git a/drake_bazel_external/.github/ubuntu_setup b/drake_bazel_external/.github/ubuntu_setup
@@ -8,5 +8,4 @@ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90-get-assume-yes
 
 export DEBIAN_FRONTEND='noninteractive'
 
-cd $(dirname "${BASH_SOURCE}")/..
 setup/install_prereqs
diff --git a/drake_cmake_external/.github/ci_build_test b/drake_cmake_external/.github/ci_build_test
@@ -5,8 +5,6 @@ set -euxo pipefail
 
 cmake --version
 
-pushd drake_cmake_external
-
 mkdir build
 pushd build
 
@@ -22,5 +20,3 @@ popd
 
 chmod -R a+w build || true
 rm -rf build
-
-popd
diff --git a/drake_cmake_external/.github/setup b/drake_cmake_external/.github/setup
@@ -3,7 +3,6 @@
 
 set -euxo pipefail
 
-cd $(dirname "${BASH_SOURCE}")
 sudo ./ubuntu_setup
 
 cat > "${HOME}/.bazelrc" << EOF

diff --git a/drake_cmake_external/.github/ubuntu_setup b/drake_cmake_external/.github/ubuntu_setup
@@ -8,5 +8,4 @@ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90-get-assume-yes
 
 export DEBIAN_FRONTEND='noninteractive'
 
-cd $(dirname "${BASH_SOURCE}")/..
 setup/install_prereqs
diff --git a/private/test/file_sync_test.py b/private/test/file_sync_test.py
@@ -22,12 +22,10 @@
     ),
     (
         "drake_bazel_download/.github/ubuntu_setup",
-        "drake_catkin_installed/.github/ubuntu_setup",
-        "drake_cmake_installed/.github/ubuntu_setup",
-    ),
-    (
         "drake_bazel_external/.github/ubuntu_setup",
+        "drake_catkin_installed/.github/ubuntu_setup",
         "drake_cmake_external/.github/ubuntu_setup",
+        "drake_cmake_installed/.github/ubuntu_setup",
     ),
     (
         "drake_ament_cmake_installed/CPPLINT.cfg",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,4 @@ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90-get-assume-yes

		export DEBIAN_FRONTEND='noninteractive'

		cd $(dirname "${BASH_SOURCE}")/..
		setup/install_prereqs