search

gazebo-tooling / release-tools

8 stars 9 forks source link

Remove sdformat.dsl file #1139

Closed j-rivero closed 4 months ago

j-rivero commented 4 months ago

Jobs should be already generated by gazebo_libs.dsl

j-rivero commented 4 months ago 
Only in /tmp/current_xml_configuration: sdformat-abichecker-any_to_any-ubuntu_auto-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat12-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat13-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat14-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat6-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat9-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat12_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat13_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat14_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat6_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat9_pkg-focal-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat12-debbuilder.xml /tmp/pr_xml_configuration/sdformat12-debbuilder.xml
--- /tmp/current_xml_configuration/sdformat12-debbuilder.xml    2024-05-16 15:21:12.869557733 +0000
+++ /tmp/pr_xml_configuration/sdformat12-debbuilder.xml 2024-05-16 15:19:23.997607413 +0000
@@ -82,7 +82,7 @@
         </hudson.model.ParametersDefinitionProperty>
         <hudson.plugins.throttleconcurrents.ThrottleJobProperty>
             <maxConcurrentPerNode>1</maxConcurrentPerNode>
-            <maxConcurrentTotal>4</maxConcurrentTotal>
+            <maxConcurrentTotal>8</maxConcurrentTotal>
             <throttleEnabled>true</throttleEnabled>
             <throttleOption>project</throttleOption>
             <categories></categories>
@@ -146,9 +146,8 @@
         <hudson.tasks.Shell>
             <command>#!/bin/bash -xe

-export NEED_C17_COMPILER=true
-export ENABLE_ROS=false
-/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-debbuild.bash
+
+/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-ignition-debbuild.bash
 </command>
         </hudson.tasks.Shell>
     </builders>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat13-debbuilder.xml /tmp/pr_xml_configuration/sdformat13-debbuilder.xml
--- /tmp/current_xml_configuration/sdformat13-debbuilder.xml    2024-05-16 15:21:12.945557703 +0000
+++ /tmp/pr_xml_configuration/sdformat13-debbuilder.xml 2024-05-16 15:19:30.321612574 +0000
@@ -82,7 +82,7 @@
         </hudson.model.ParametersDefinitionProperty>
         <hudson.plugins.throttleconcurrents.ThrottleJobProperty>
             <maxConcurrentPerNode>1</maxConcurrentPerNode>
-            <maxConcurrentTotal>4</maxConcurrentTotal>
+            <maxConcurrentTotal>8</maxConcurrentTotal>
             <throttleEnabled>true</throttleEnabled>
             <throttleOption>project</throttleOption>
             <categories></categories>
@@ -146,9 +146,8 @@
         <hudson.tasks.Shell>
             <command>#!/bin/bash -xe

-export NEED_C17_COMPILER=true
-export ENABLE_ROS=false
-/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-debbuild.bash
+
+/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-ignition-debbuild.bash
 </command>
         </hudson.tasks.Shell>
     </builders>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat14-debbuilder.xml /tmp/pr_xml_configuration/sdformat14-debbuilder.xml
--- /tmp/current_xml_configuration/sdformat14-debbuilder.xml    2024-05-16 15:21:13.025557671 +0000
+++ /tmp/pr_xml_configuration/sdformat14-debbuilder.xml 2024-05-16 15:19:33.765611404 +0000
@@ -82,7 +82,7 @@
         </hudson.model.ParametersDefinitionProperty>
         <hudson.plugins.throttleconcurrents.ThrottleJobProperty>
             <maxConcurrentPerNode>1</maxConcurrentPerNode>
-            <maxConcurrentTotal>4</maxConcurrentTotal>
+            <maxConcurrentTotal>8</maxConcurrentTotal>
             <throttleEnabled>true</throttleEnabled>
             <throttleOption>project</throttleOption>
             <categories></categories>
@@ -146,9 +146,8 @@
         <hudson.tasks.Shell>
             <command>#!/bin/bash -xe

-export NEED_C17_COMPILER=true
-export ENABLE_ROS=false
-/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-debbuild.bash
+
+/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-ignition-debbuild.bash
 </command>
         </hudson.tasks.Shell>
     </builders>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat15-debbuilder.xml /tmp/pr_xml_configuration/sdformat15-debbuilder.xml
--- /tmp/current_xml_configuration/sdformat15-debbuilder.xml    2024-05-16 15:21:13.105557638 +0000
+++ /tmp/pr_xml_configuration/sdformat15-debbuilder.xml 2024-05-16 15:19:38.793615138 +0000
@@ -82,7 +82,7 @@
         </hudson.model.ParametersDefinitionProperty>
         <hudson.plugins.throttleconcurrents.ThrottleJobProperty>
             <maxConcurrentPerNode>1</maxConcurrentPerNode>
-            <maxConcurrentTotal>4</maxConcurrentTotal>
+            <maxConcurrentTotal>8</maxConcurrentTotal>
             <throttleEnabled>true</throttleEnabled>
             <throttleOption>project</throttleOption>
             <categories></categories>
@@ -147,8 +147,7 @@
             <command>#!/bin/bash -xe

-export ENABLE_ROS=false
-/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-debbuild.bash
+/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-ignition-debbuild.bash
 </command>
         </hudson.tasks.Shell>
     </builders>
Only in /tmp/current_xml_configuration: sdformat6-debbuilder.xml
Only in /tmp/current_xml_configuration: sdformat6-install_bottle-homebrew-amd64.xml
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/sdformat9-debbuilder.xml /tmp/pr_xml_configuration/sdformat9-debbuilder.xml
--- /tmp/current_xml_configuration/sdformat9-debbuilder.xml 2024-05-16 15:21:12.789557766 +0000
+++ /tmp/pr_xml_configuration/sdformat9-debbuilder.xml  2024-05-16 15:19:19.861599162 +0000
@@ -82,7 +82,7 @@
         </hudson.model.ParametersDefinitionProperty>
         <hudson.plugins.throttleconcurrents.ThrottleJobProperty>
             <maxConcurrentPerNode>1</maxConcurrentPerNode>
-            <maxConcurrentTotal>4</maxConcurrentTotal>
+            <maxConcurrentTotal>8</maxConcurrentTotal>
             <throttleEnabled>true</throttleEnabled>
             <throttleOption>project</throttleOption>
             <categories></categories>
@@ -146,9 +146,8 @@
         <hudson.tasks.Shell>
             <command>#!/bin/bash -xe

-export NEED_C17_COMPILER=true
-export ENABLE_ROS=false
-/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-debbuild.bash
+
+/bin/bash -x ./scripts/jenkins-scripts/docker/multidistribution-ignition-debbuild.bash
 </command>
         </hudson.tasks.Shell>
     </builders>
j-rivero commented 4 months ago

ABICHECKERS

Only in /tmp/current_xml_configuration: sdformat-abichecker-any_to_any-ubuntu_auto-amd64.xml

:heavy_check_mark: abicheckers are now generated on gazebo_libs:

rs [?] ❯ ls sdformat*abi*
sdformat-abichecker-any_to_any-ubuntu-focal-amd64.xml
sdformat-abichecker-any_to_any-ubuntu-jammy-amd64.xml
sdformat-abichecker-any_to_any-ubuntu-noble-amd64.xml

ASAN

Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat12-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat13-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat14-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat6-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-ci_asan-sdformat9-focal-amd64.xml

:heavy_check_mark: The asan jobs were renamed to use real branch names. The sdformat6 is gone (EOL already)

rs [?] ❯ ls sdformat*asan*
sdformat-ci_asan-main-noble-amd64.xml
sdformat-ci_asan-sdf12-focal-amd64.xml
sdformat-ci_asan-sdf13-focal-amd64.xml
sdformat-ci_asan-sdf14-jammy-amd64.xml
sdformat-ci_asan-sdf9-focal-amd64.xml

INSTALL

Only in /tmp/current_xml_configuration: sdformat-install-sdformat12_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat13_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat14_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat6_pkg-focal-amd64.xml
Only in /tmp/current_xml_configuration: sdformat-install-sdformat9_pkg-focal-amd64.xml

:heavy_check_mark: On gazebo libs: 6 is gone (EOL), 9 and 13 in focal and 14 and 15 in jammy. Looks good to me.

sdformat12-install-pkg-focal-amd64.xml
sdformat13-install-pkg-focal-amd64.xml
sdformat14-install-pkg-jammy-amd64.xml
sdformat15-install-pkg-jammy-amd64.xml
sdformat9-install-pkg-focal-amd64.xml

DEBBUILDER:

Comparing multidistribution-debbuild.bash and multidistribution-debbuild.bash the diffs are not going to change anything I think.

release-tools3/jenkins-scripts/docker on  jrivero/remove_indexes_noble_prs [?] ❯ diff -u multidistribution-debbuild.bash multidistribution-ignition-debbuild.bash 
--- multidistribution-debbuild.bash 2023-11-10 18:04:20.472363237 +0100
+++ multidistribution-ignition-debbuild.bash    2023-11-10 18:04:20.472363237 +0100
@@ -5,6 +5,7 @@
 SCRIPT_DIR="${SCRIPT_DIR%/*}"

 export RELEASE_REPO_DIRECTORY=${DISTRO}
-export ENABLE_ROS=${ENABLE_ROS:-true}
+export ENABLE_ROS=false
+export GITHUB_ORG=gazebosim

 . ${SCRIPT_DIR}/lib/debbuild-base.bash

The export NEED_C17_COMPILER=true is more relevant since it can modify the ABI. Seems to only affect Bionic witch is EOL. I would vote to remove bionic from the sdformat9 repository not to release in that platform anymore.

And finally the change in maxConcurrentTotal for the number of jobs triggered in Jenkins is fine to be inline with the rest of configuration.

scpeters commented 4 months ago

The export NEED_C17_COMPILER=true is more relevant since it can modify the ABI. Seems to only affect Bionic witch is EOL. I would vote to remove bionic from the sdformat9 repository not to release in that platform anymore.

👍