From 16f39ca9e38e500a3fd929fdf362dc2cba79854f Mon Sep 17 00:00:00 2001 From: Koby Meir Date: Wed, 8 Nov 2023 17:45:03 +0200 Subject: [PATCH] convert jira issues - removing backward compatible, adding links (#30714) convert jira issues - removing backward compatible, adding links #30714 --- ci/.gitlab-ci.global.yml | 4 ++-- ci/.gitlab-ci.on-push.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/.gitlab-ci.global.yml b/ci/.gitlab-ci.global.yml index ff29f1fc3e5c..df36af92b74b 100644 --- a/ci/.gitlab-ci.global.yml +++ b/ci/.gitlab-ci.global.yml @@ -95,7 +95,7 @@ - section_end "Stop contrib external build" .create_artifacts_and_server_type_instance_folders: &create_artifacts_and_server_type_instance_folders - - section_start "Create Artifacts & Server Instance & Server Type folders" --collapsed + - section_start "Create Artifacts, Server Instance, Server Type folders" --collapsed - | if [[ -n "${ARTIFACTS_FOLDER}" ]] && [[ ! -d "${ARTIFACTS_FOLDER}" ]]; then echo "Creating Artifacts folder: ${ARTIFACTS_FOLDER}" @@ -113,7 +113,7 @@ mkdir -p -m 777 "${ARTIFACTS_FOLDER_SERVER_TYPE}/logs" # using the -p to create the logs folder as well. echo "${SERVER_TYPE}" > "${ARTIFACTS_FOLDER_SERVER_TYPE}/server_type.txt" fi - - section_end "Create Artifacts & Server Instance & Server Type folders" + - section_end "Create Artifacts, Server Instance, Server Type folders" .clone_and_export_variables: &clone_and_export_variables - section_start "Git - Job Start Actions" --collapsed diff --git a/ci/.gitlab-ci.on-push.yml b/ci/.gitlab-ci.on-push.yml index b59fae70369d..32af242d1a9b 100644 --- a/ci/.gitlab-ci.on-push.yml +++ b/ci/.gitlab-ci.on-push.yml @@ -291,6 +291,7 @@ xpanse-prepare-testing-bucket: echo "Instance role:${INSTANCE_ROLE} Product type:${PRODUCT_TYPE}" if [ -n "${NIGHTLY}" ] && [ "${INSTANCE_ROLE}" != "Server Master" ]; then echo "Not running the instance flow, not a Server Master instance and we are in a nightly build." + rm -f "${ARTIFACTS_FOLDER_INSTANCE}/instance_role.txt" # delete the instance_role.txt file so the job will not be collected by slack notifier. job-done exit 0 fi