fix prepare_content_packs_for_testing.sh (#30749)

fix prepare_content_packs_for_testing.sh #30749
demisto · Nov 8, 2023 · 2ddd6ec · 2ddd6ec
1 parent 4e4eb67
commit 2ddd6ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ci/.gitlab-ci.bucket-upload.yml b/ci/.gitlab-ci.bucket-upload.yml
@@ -232,6 +232,7 @@ install-packs-in-server-master:
     PRODUCT_TYPE: "XSIAM"
     SERVER_TYPE: "XSIAM"
     ARTIFACTS_FOLDER: "${ARTIFACTS_FOLDER_MPV2}"
+    ARTIFACTS_FOLDER_INSTANCE: "${ARTIFACTS_FOLDER_MPV2}/instance_${INSTANCE_ROLE}"
     ARTIFACTS_FOLDER_SERVER_TYPE: "${ARTIFACTS_FOLDER_MPV2}/server_type_${SERVER_TYPE}"
     ENV_RESULTS_PATH: "${ARTIFACTS_FOLDER_SERVER_TYPE}/env_results.json"
     INSTANCE_CREATED: "true"
@@ -264,9 +265,7 @@ install-packs-in-server-master:
       else
         echo "${CLOUD_API_KEYS}" > "cloud_api_keys.json"
       fi
-    - section_start "Clean Machine"
-    - ./Tests/scripts/uninstall_packs_and_reset_bucket_cloud.sh || EXIT_CODE=$?
-    - section_end "Clean Machine"
+    - !reference [.uninstall-packs-and-reset-bucket-cloud]
 
     - section_start "Run end to end sanity tests"
     - ./Tests/scripts/run_end_to_end_tests.sh || EXIT_CODE=$?

diff --git a/ci/.gitlab-ci.build-machines-cleanup.yml b/ci/.gitlab-ci.build-machines-cleanup.yml
@@ -39,6 +39,7 @@ build-machines-cleanup:
     CLOUD_API_KEYS: $XSIAM_API_KEYS
     CLOUD_API_TOKENS: $XSIAM_TOKENS
     ARTIFACTS_FOLDER: "${ARTIFACTS_FOLDER_MPV2}"
+    ARTIFACTS_FOLDER_INSTANCE: "${ARTIFACTS_FOLDER_MPV2}/instance_${INSTANCE_ROLE}"
     ARTIFACTS_FOLDER_SERVER_TYPE: "${ARTIFACTS_FOLDER_MPV2}/server_type_${SERVER_TYPE}"
     ENV_RESULTS_PATH: "${ARTIFACTS_FOLDER_SERVER_TYPE}/env_results.json"
     GCS_MARKET_BUCKET: "${GCS_MARKET_V2_BUCKET}"