Skip to content

Define GZDEV_PROJECT_NAME=rotary for the rotary distribution in DSL#1456

Merged
j-rivero merged 2 commits intomasterfrom
jrivero/rotary_dsl_gzdev
Mar 10, 2026
Merged

Define GZDEV_PROJECT_NAME=rotary for the rotary distribution in DSL#1456
j-rivero merged 2 commits intomasterfrom
jrivero/rotary_dsl_gzdev

Conversation

@j-rivero
Copy link
Contributor

Together with gazebo-tooling/gzdev#101, part of #1446.

This pull request updates the handling of the GZDEV_PROJECT_NAME environment variable in both the Docker compilation scripts and Jenkins DSL scripts.

First commit make the compilation scripts to respect the GZDEV_PROJECT_NAME if it was set. 4950aa1

Second commit injects the GZDEV_PROJECT_NAME=rotary for the -ci- runs that are generated with from rotary.

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@j-rivero
Copy link
Contributor Author

I miss the rotary enabled for the -pr-any-

diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_cmake-ci-main-noble-amd64.xml /tmp/pr_xml_configuration/gz_cmake-ci-main-noble-amd64.xml
--- /tmp/current_xml_configuration/gz_cmake-ci-main-noble-amd64.xml	2026-03-10 11:18:54.000857894 +0000
+++ /tmp/pr_xml_configuration/gz_cmake-ci-main-noble-amd64.xml	2026-03-10 11:18:40.578888003 +0000
@@ -75,7 +75,7 @@
             <command>#!/bin/bash -xe
 
 
-
+export GZDEV_PROJECT_NAME=rotary
 export BUILDING_EXTRA_CMAKE_PARAMS=""
 export BUILDING_EXTRA_MAKETEST_PARAMS=""
 export BUILDING_SOFTWARE_DIRECTORY="gz-cmake"
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_cmake-ci_asan-main-noble-amd64.xml /tmp/pr_xml_configuration/gz_cmake-ci_asan-main-noble-amd64.xml
--- /tmp/current_xml_configuration/gz_cmake-ci_asan-main-noble-amd64.xml	2026-03-10 11:18:54.004034144 +0000
+++ /tmp/pr_xml_configuration/gz_cmake-ci_asan-main-noble-amd64.xml	2026-03-10 11:18:40.582951277 +0000
@@ -72,17 +72,18 @@
 </command>
         </hudson.tasks.Shell>
         <hudson.tasks.Shell>
-            <command>#!/bin/bash -xe
-
+            <command>            #!/bin/bash -xe
 
+            
+            export GZDEV_PROJECT_NAME=rotary
 export ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true
-export BUILDING_EXTRA_CMAKE_PARAMS="-DGZ_SANITIZER=Address"
-export BUILDING_EXTRA_MAKETEST_PARAMS="-E _i?g[nz]_TEST"
-export BUILDING_SOFTWARE_DIRECTORY="gz-cmake"
-export DISTRO=noble
-export ARCH=amd64
-/bin/bash -xe ./scripts/jenkins-scripts/docker/gz_cmake-compilation.bash
-</command>
+            export BUILDING_EXTRA_CMAKE_PARAMS="-DGZ_SANITIZER=Address"
+            export BUILDING_EXTRA_MAKETEST_PARAMS="-E _i?g[nz]_TEST"
+            export BUILDING_SOFTWARE_DIRECTORY="gz-cmake"
+            export DISTRO=noble
+            export ARCH=amd64
+            /bin/bash -xe ./scripts/jenkins-scripts/docker/gz_cmake-compilation.bash
+            </command>
         </hudson.tasks.Shell>
     </builders>
     <publishers>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_cmake-install-pkg-noble-amd64.xml /tmp/pr_xml_configuration/gz_cmake-install-pkg-noble-amd64.xml
--- /tmp/current_xml_configuration/gz_cmake-install-pkg-noble-amd64.xml	2026-03-10 11:18:55.511163212 +0000
+++ /tmp/pr_xml_configuration/gz_cmake-install-pkg-noble-amd64.xml	2026-03-10 11:18:42.146061353 +0000
@@ -65,7 +65,7 @@
 export DISTRO=noble
 export ARCH=amd64
 export INSTALL_JOB_PKG=libgz-cmake-dev
-export GZDEV_PROJECT_NAME="gz-cmake"
+export GZDEV_PROJECT_NAME="rotary"
 /bin/bash -x ./scripts/jenkins-scripts/docker/generic-install-test-job.bash
 </command>
         </hudson.tasks.Shell>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/gz_rotary-install-pkg-noble-amd64.xml /tmp/pr_xml_configuration/gz_rotary-install-pkg-noble-amd64.xml
--- /tmp/current_xml_configuration/gz_rotary-install-pkg-noble-amd64.xml	2026-03-10 11:18:56.526756877 +0000
+++ /tmp/pr_xml_configuration/gz_rotary-install-pkg-noble-amd64.xml	2026-03-10 11:18:43.170965570 +0000
@@ -64,7 +64,7 @@
 export DISTRO=noble
 export ARCH=amd64
 export INSTALL_JOB_PKG=gz-rotary
-export GZDEV_PROJECT_NAME="gz-rotary"
+export GZDEV_PROJECT_NAME="rotary"
 if [[ rotary == 'citadel' || rotary == 'fortress' ]]; then
    export GZ_SIM_RUNTIME_TEST_USE_IGN=true
 fi

@j-rivero
Copy link
Contributor Author

The -pr- jobs is more tricky: we are using unified jobs names for all the branches, hence gz_math-ci-pr_any-noble-amd64.xml. This makes more complicated to know when we need to apply the GZDEV_PROJECT_NAME="rotary". Evaluating ghprbTargetBranch (injected by the Jenkins integration) will work for automatic PRs but won't work for manual runs using the job where we only indicate the reference of the branch sha1 = jrivero/foo-branch.

Workaround probably is back to enable the per-lib entries in gzdev. Solution may pass by your comment @azeey of adding somehow a metadata in the source code that allows the build to say that this is a rotary build.

@j-rivero
Copy link
Contributor Author

Workaround probably is back to enable the per-lib entries in gzdev. Solution may pass by your comment @azeey of adding somehow a metadata in the source code that allows the build to say that this is a rotary build.

Deployed in gazebo-tooling/gzdev#103

@j-rivero j-rivero merged commit 70e563c into master Mar 10, 2026
3 checks passed
@j-rivero j-rivero deleted the jrivero/rotary_dsl_gzdev branch March 10, 2026 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants