search

gazebo-tooling / release-tools

8 stars 9 forks source link

Fix dsl to assure that BUILDING_SOFTWARE_DIRECTORY and git checkout dir are in sync #1052

Closed j-rivero closed 8 months ago

j-rivero commented 8 months ago

There is a problem with the github checkout in -ci-${branch}- that don't match the github repository name, i.e: gz-common as github repository name and ign-common as library name comming from yaml.

Let's force the code to be always in sync by adding the checkout subdir parameter to OSRFGitHub.create and use the same variable in BUILDING_SOFTWARE_DIRECTORY.

j-rivero commented 8 months ago 
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_cmake-ci-ign-cmake2-bionic-amd64.xml /tmp/pr_xml_configuration/ign_cmake-ci-ign-cmake2-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_cmake-ci-ign-cmake2-bionic-amd64.xml 2023-11-01 15:51:34.383909234 +0000
+++ /tmp/pr_xml_configuration/ign_cmake-ci-ign-cmake2-bionic-amd64.xml  2023-11-01 15:49:36.146348153 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-cmake</relativeTargetDir>
+                <relativeTargetDir>ign-cmake</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_common-ci-ign-common3-bionic-amd64.xml /tmp/pr_xml_configuration/ign_common-ci-ign-common3-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_common-ci-ign-common3-bionic-amd64.xml   2023-11-01 15:51:35.671925996 +0000
+++ /tmp/pr_xml_configuration/ign_common-ci-ign-common3-bionic-amd64.xml    2023-11-01 15:49:37.454367187 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-common</relativeTargetDir>
+                <relativeTargetDir>ign-common</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_fuel_tools-ci-ign-fuel-tools4-bionic-amd64.xml /tmp/pr_xml_configuration/ign_fuel_tools-ci-ign-fuel-tools4-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_fuel_tools-ci-ign-fuel-tools4-bionic-amd64.xml   2023-11-01 15:51:38.015956501 +0000
+++ /tmp/pr_xml_configuration/ign_fuel_tools-ci-ign-fuel-tools4-bionic-amd64.xml    2023-11-01 15:49:39.810401471 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-fuel-tools</relativeTargetDir>
+                <relativeTargetDir>ign-fuel-tools</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_gazebo-ci-ign-gazebo3-bionic-amd64.xml /tmp/pr_xml_configuration/ign_gazebo-ci-ign-gazebo3-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_gazebo-ci-ign-gazebo3-bionic-amd64.xml   2023-11-01 15:51:39.811979874 +0000
+++ /tmp/pr_xml_configuration/ign_gazebo-ci-ign-gazebo3-bionic-amd64.xml    2023-11-01 15:49:41.558425174 +0000
@@ -409,7 +409,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-sim</relativeTargetDir>
+                <relativeTargetDir>ign-gazebo</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_gui-ci-ign-gui3-bionic-amd64.xml /tmp/pr_xml_configuration/ign_gui-ci-ign-gui3-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_gui-ci-ign-gui3-bionic-amd64.xml 2023-11-01 15:51:38.719965663 +0000
+++ /tmp/pr_xml_configuration/ign_gui-ci-ign-gui3-bionic-amd64.xml  2023-11-01 15:49:40.510411429 +0000
@@ -409,7 +409,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-gui</relativeTargetDir>
+                <relativeTargetDir>ign-gui</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_launch-ci-ign-launch2-bionic-amd64.xml /tmp/pr_xml_configuration/ign_launch-ci-ign-launch2-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_launch-ci-ign-launch2-bionic-amd64.xml   2023-11-01 15:51:40.155984351 +0000
+++ /tmp/pr_xml_configuration/ign_launch-ci-ign-launch2-bionic-amd64.xml    2023-11-01 15:49:41.902429685 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-launch</relativeTargetDir>
+                <relativeTargetDir>ign-launch</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_math-ci-ign-math6-bionic-amd64.xml /tmp/pr_xml_configuration/ign_math-ci-ign-math6-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_math-ci-ign-math6-bionic-amd64.xml   2023-11-01 15:51:34.967916834 +0000
+++ /tmp/pr_xml_configuration/ign_math-ci-ign-math6-bionic-amd64.xml    2023-11-01 15:49:36.746356884 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-math</relativeTargetDir>
+                <relativeTargetDir>ign-math</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_msgs-ci-ign-msgs5-bionic-amd64.xml /tmp/pr_xml_configuration/ign_msgs-ci-ign-msgs5-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_msgs-ci-ign-msgs5-bionic-amd64.xml   2023-11-01 15:51:36.019930525 +0000
+++ /tmp/pr_xml_configuration/ign_msgs-ci-ign-msgs5-bionic-amd64.xml    2023-11-01 15:49:37.802372251 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-msgs</relativeTargetDir>
+                <relativeTargetDir>ign-msgs</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_physics-ci-ign-physics2-bionic-amd64.xml /tmp/pr_xml_configuration/ign_physics-ci-ign-physics2-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_physics-ci-ign-physics2-bionic-amd64.xml 2023-11-01 15:51:39.431974929 +0000
+++ /tmp/pr_xml_configuration/ign_physics-ci-ign-physics2-bionic-amd64.xml  2023-11-01 15:49:41.206420557 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-physics</relativeTargetDir>
+                <relativeTargetDir>ign-physics</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_plugin-ci-ign-plugin1-bionic-amd64.xml /tmp/pr_xml_configuration/ign_plugin-ci-ign-plugin1-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_plugin-ci-ign-plugin1-bionic-amd64.xml   2023-11-01 15:51:35.319921415 +0000
+++ /tmp/pr_xml_configuration/ign_plugin-ci-ign-plugin1-bionic-amd64.xml    2023-11-01 15:49:37.102362065 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-plugin</relativeTargetDir>
+                <relativeTargetDir>ign-plugin</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_rendering-ci-ign-rendering3-bionic-amd64.xml /tmp/pr_xml_configuration/ign_rendering-ci-ign-rendering3-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_rendering-ci-ign-rendering3-bionic-amd64.xml 2023-11-01 15:51:36.367935054 +0000
+++ /tmp/pr_xml_configuration/ign_rendering-ci-ign-rendering3-bionic-amd64.xml  2023-11-01 15:49:38.150377315 +0000
@@ -409,7 +409,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-rendering</relativeTargetDir>
+                <relativeTargetDir>ign-rendering</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_sensors-ci-ign-sensors3-bionic-amd64.xml /tmp/pr_xml_configuration/ign_sensors-ci-ign-sensors3-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_sensors-ci-ign-sensors3-bionic-amd64.xml 2023-11-01 15:51:39.071970244 +0000
+++ /tmp/pr_xml_configuration/ign_sensors-ci-ign-sensors3-bionic-amd64.xml  2023-11-01 15:49:40.858415993 +0000
@@ -409,7 +409,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-sensors</relativeTargetDir>
+                <relativeTargetDir>ign-sensors</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_tools-ci-ign-tools1-bionic-amd64.xml /tmp/pr_xml_configuration/ign_tools-ci-ign-tools1-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_tools-ci-ign-tools1-bionic-amd64.xml 2023-11-01 15:51:34.619912305 +0000
+++ /tmp/pr_xml_configuration/ign_tools-ci-ign-tools1-bionic-amd64.xml  2023-11-01 15:49:36.386351646 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-tools</relativeTargetDir>
+                <relativeTargetDir>ign-tools</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>
diff -ur -I '.*<id>dashboard_portlet_.*</id>.*' /tmp/current_xml_configuration/ign_transport-ci-ign-transport8-bionic-amd64.xml /tmp/pr_xml_configuration/ign_transport-ci-ign-transport8-bionic-amd64.xml
--- /tmp/current_xml_configuration/ign_transport-ci-ign-transport8-bionic-amd64.xml 2023-11-01 15:51:38.367961082 +0000
+++ /tmp/pr_xml_configuration/ign_transport-ci-ign-transport8-bionic-amd64.xml  2023-11-01 15:49:40.162406594 +0000
@@ -402,7 +402,7 @@
         <gitTool>Default</gitTool>
         <extensions>
             <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
-                <relativeTargetDir>gz-transport</relativeTargetDir>
+                <relativeTargetDir>ign-transport</relativeTargetDir>
             </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
         </extensions>
         <browser class='hudson.plugins.git.browser.GithubWeb'>

Looks good.