Merge branch 'master' into jrivero/log_plus_yaml_collection5

gazebo-tooling · Sep 18, 2023 · 6a6ffef · 6a6ffef
2 parents 3cd7f45 + 2581ee0
commit 6a6ffef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl
@@ -490,6 +490,9 @@ gz_collections_yaml.collections.each { collection ->
              export ROS_BOOTSTRAP=true
              # needed for arm64 machines and other arch tests
              export ENABLE_GZ_SIM_RUNTIME_TEST=false
+             if [[ ${gz_collection_name} == 'citadel' || ${gz_collection_name} == 'fortress' ]]; then
+                export GZ_SIM_RUNTIME_TEST_USE_IGN=true
+             fi
              if [[ \${JENKINS_NODE_TAG} == 'gpu-reliable' ]]; then
                export ENABLE_GZ_SIM_RUNTIME_TEST=true
              fi

diff --git a/jenkins-scripts/dsl/sdformat.dsl b/jenkins-scripts/dsl/sdformat.dsl
@@ -1,10 +1,10 @@
 import _configs_.*
 import javaposse.jobdsl.dsl.Job
 
-def sdformat_supported_versions = [ 'sdformat6' , 'sdformat9', 'sdformat12', 'sdformat13' ]
+def sdformat_supported_versions = [ 'sdformat6' , 'sdformat9', 'sdformat12', 'sdformat13', 'sdformat14' ]
 def sdformat_gz11_versions = [ 'sdformat9', 'sdformat12', 'sdformat13', 'main' ]
 // nightly and prereleases
-def extra_sdformat_debbuilder = ['sdformat14']
+def extra_sdformat_debbuilder = []
 
 // Main platform using for quick CI
 def ci_distro               = Globals.get_ci_distro()
@@ -89,7 +89,6 @@ ci_distro.each { distro ->
     // --------------------------------------------------------------
     // 2. Create the any job
     String sdf_repo = "gazebosim/sdformat"
-
     def sdformat_ci_any_job = job(ci_build_any_job_name_linux)
     OSRFLinuxCompilationAnyGitHub.create(sdformat_ci_any_job, sdf_repo)
     sdformat_ci_any_job.with