Fixup groovy call to is_official_release for SaaS file upload to Nexus

... the function is part of versioning CMK-18069 Change-Id: I4ce99fba1e126507fac3542fcd68ee8cb95938d6 (cherry picked from commit 2f1503d)
Checkmk · Sep 26, 2024 · a0c7e16 · a0c7e16
1 parent 1819ead
commit a0c7e16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/buildscripts/scripts/build-cmk-packages.groovy b/buildscripts/scripts/build-cmk-packages.groovy
@@ -368,7 +368,7 @@ def main() {
                 }
             }
 
-            if (EDITION.toLowerCase() == "saas" && is_official_release(cmk_version_rc_aware)) {
+            if (EDITION.toLowerCase() == "saas" && versioning.is_official_release(cmk_version_rc_aware)) {
                 // check-mk-saas-2.3.0p17.cse.tar.gz + .hash
                 // check-mk-saas-2.3.0p17_0.jammy_amd64.deb + .hash
                 artifacts_helper.upload_files_to_nexus(

diff --git a/buildscripts/scripts/utils/upload_artifacts.groovy b/buildscripts/scripts/utils/upload_artifacts.groovy
@@ -117,8 +117,8 @@ def upload_files_to_nexus(SOURCE_PATTERN, UPLOAD_DEST) {
     withCredentials([usernamePassword(credentialsId: 'nexus', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USERNAME')]) {
         sh("""
             for i in ${SOURCE_PATTERN}; do
-                echo "Upload $i to Nexus";
-                curl -sSf -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --upload-file "${i}" "${UPLOAD_DEST}";
+                echo "Upload \${i} to Nexus";
+                curl -sSf -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --upload-file "\${i}" "${UPLOAD_DEST}";
             done
         """);
     }