Do not use TARBALL_NAME anymore

Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Oct 6, 2023 · df5356f · df5356f
1 parent abbc13b
commit df5356f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy b/jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy
@@ -137,7 +137,7 @@ class OSRFSourceCreation
                     parameters {
                       currentBuild()
                       predefinedProps([PROJECT_NAME_TO_COPY_ARTIFACTS: "\${JOB_NAME}"])
-                      propertiesFile(properties_file) // TARBALL_NAME
+                      propertiesFile(properties_file) // SOURCE_TARBALL_URI
                     }
                   }
                 }

diff --git a/jenkins-scripts/dsl/test.dsl b/jenkins-scripts/dsl/test.dsl
@@ -50,7 +50,6 @@ repo_uploader.with
   parameters
   {
     stringParam('PACKAGE','','Package name')
-    stringParam('TARBALL_NAME', '', 'Tarball name to upload')
     stringParam('S3_UPLOAD_PATH','', 'S3 path to upload')
     stringParam('S3_FILES_TO_UPLOAD','', 'S3 file names to upload')
     stringParam('UPLOAD_TO_REPO','none','repo to upload')
@@ -63,7 +62,7 @@ repo_uploader.with
   {
     copyArtifacts('${PROJECT_NAME_TO_COPY_ARTIFACTS}')
     {
-      includePatterns("${pkg_sources_dir}/\${TARBALL_NAME}")
+      includePatterns("${pkg_sources_dir}/*")
       buildSelector {
         upstreamBuild()
       }
@@ -75,7 +74,10 @@ repo_uploader.with
           # check that the tarball name actually exist
 
           ls -R \${WORKSPACE}
-          test -f \${WORKSPACE}/${pkg_sources_dir}/\${TARBALL_NAME}
+
+          for pkg in \$(ls ${pkg_sources_dir}/); do
+            test -f \${WORKSPACE}/${pkg_sources_dir}/\${pkg}
+          done
 
           echo "Fake upload of \${S3_FILES_TO_UPLOAD} to \${S3_UPLOAD_PATH}"
           # code copied from repository_uploader