Remove some unnecessary inside_container calls

CMK-21388

Change-Id: I7d8e4041709a72d96b9df38d03ede3774ed66d97

Author: JonasScharpf

buildscripts/scripts/build-cmk-deliverables.groovy

@@ -274,21 +274,19 @@ def main() {
 
         // this must not be called from within the container (results in yaml package missing)
         def exclude_pattern = versioning.get_internal_artifacts_pattern();
-        inside_container(ulimit_nofile: 1024) {
-            artifacts_helper.upload_version_dir(
-                deliverables_dir,
-                WEB_DEPLOY_DEST,
-                WEB_DEPLOY_PORT,
-                EXCLUDE_PATTERN=exclude_pattern,
-            );
+        artifacts_helper.upload_version_dir(
+            deliverables_dir,
+            WEB_DEPLOY_DEST,
+            WEB_DEPLOY_PORT,
+            EXCLUDE_PATTERN=exclude_pattern,
+        );
 
-            if (EDITION.toLowerCase() == "saas" && versioning.is_official_release(cmk_version_rc_aware)) {
-                // uploads distro packages, source.tar.gz and hashes
-                artifacts_helper.upload_files_to_nexus(
-                    "${deliverables_dir}/check-mk-saas-${cmk_version}*",
-                    "${ARTIFACT_STORAGE}/repository/saas-patch-releases/",
-                );
-            }
+        if (EDITION.toLowerCase() == "saas" && versioning.is_official_release(cmk_version_rc_aware)) {
+            // uploads distro packages, source.tar.gz and hashes
+            artifacts_helper.upload_files_to_nexus(
+                "${deliverables_dir}/check-mk-saas-${cmk_version}*",
+                "${ARTIFACT_STORAGE}/repository/saas-patch-releases/",
+            );
         }
     }
 

buildscripts/scripts/deploy-to-website.groovy

@@ -16,11 +16,9 @@ def main() {
     def versioning = load("${checkout_dir}/buildscripts/scripts/utils/versioning.groovy");
     def artifacts_helper = load("${checkout_dir}/buildscripts/scripts/utils/upload_artifacts.groovy");
 
-    def cmk_version_rc_aware = versioning.get_cmk_version(
-        versioning.safe_branch_name(scm),
-        versioning.get_branch_version(checkout_dir),
-        params.VERSION
-    );
+    def safe_branch_name = versioning.safe_branch_name(scm);
+    def branch_version = versioning.get_branch_version(checkout_dir);
+    def cmk_version_rc_aware = versioning.get_cmk_version(safe_branch_name, branch_version, params.VERSION);
 
     print(
         """
@@ -33,22 +31,20 @@ def main() {
         |===================================================
         """.stripMargin());
 
-    inside_container(ulimit_nofile: 1024) {
-        smart_stage(
-            name: "Deploy to website",
-        ) {
-            artifacts_helper.deploy_to_website(
-                cmk_version_rc_aware
-            );
-        }
-        smart_stage(
-            name: "Cleanup RC candicates",
-            condition: params.CIPARAM_REMOVE_RC_CANDIDATES,
-        ) {
-            artifacts_helper.cleanup_rc_candidates_of_version(
-               cmk_version_rc_aware
-            );
-        }
+    smart_stage(
+        name: "Deploy to website",
+    ) {
+        artifacts_helper.deploy_to_website(
+            cmk_version_rc_aware
+        );
+    }
+    smart_stage(
+        name: "Cleanup RC candicates",
+        condition: params.CIPARAM_REMOVE_RC_CANDIDATES,
+    ) {
+        artifacts_helper.cleanup_rc_candidates_of_version(
+           cmk_version_rc_aware
+        );
     }
 }