Use gz- projects on Homebrew CI (#778)

* Use gz- projects on Homebrew CI Signed-off-by: Louise Poubel <[email protected]> * More instances Signed-off-by: Louise Poubel <[email protected]> * Don't be greedy, keep ign- path for now Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Aug 3, 2022 · 180794e · 180794e
1 parent 817fbdf
commit 180794e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/jenkins-scripts/dsl/ignition.dsl b/jenkins-scripts/dsl/ignition.dsl
@@ -558,7 +558,7 @@ ignition_software.each { ign_sw ->
               then
                 /bin/bash -xe "\$HOMEBREW_SCRIPT"
               else
-                /bin/bash -xe "./scripts/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash" "ignition-${ign_sw}"
+                /bin/bash -xe "./scripts/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash" "gz-${ign_sw}"
               fi
               """.stripIndent())
       }
@@ -591,7 +591,7 @@ ignition_software.each { ign_sw ->
                 then
                   /bin/bash -xe "\$HOMEBREW_SCRIPT"
                 else
-                  /bin/bash -xe "./scripts/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash" "ignition-${ign_sw}"
+                  /bin/bash -xe "./scripts/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash" "gz-${ign_sw}"
                 fi
                 """.stripIndent())
         }

diff --git a/jenkins-scripts/dsl/ignition_collection.dsl b/jenkins-scripts/dsl/ignition_collection.dsl
@@ -355,7 +355,7 @@ ignition_collections.each { ign_collection ->
         shell("""\
               #!/bin/bash -xe
 
-              /bin/bash -xe "./scripts/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash" "ignition-${ign_collection_name}"
+              /bin/bash -xe "./scripts/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash" "gz-${ign_collection_name}"
               """.stripIndent())
       }
   }

diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash
@@ -13,10 +13,10 @@ export HOMEBREW_MAKE_JOBS=${MAKE_JOBS}
 PROJECT=$1 # project will have the major version included (ex gazebo2)
 PROJECT_ARGS=${2}
 
-# In ignition projects, the name of the repo and the formula does not match
+# TODO(chapulina) Use gz path instead of legacy ign
 PROJECT_PATH=${PROJECT}
-if [[ ${PROJECT/ignition} != ${PROJECT} ]]; then
-    PROJECT_PATH="ign${PROJECT/ignition}"
+if [[ ${PROJECT/gz} != ${PROJECT} ]]; then
+    PROJECT_PATH="ign${PROJECT/gz}"
     PROJECT_PATH="${PROJECT_PATH/[0-9]*}"
 fi