diff --git a/Utils/gitlab_triggers/trigger_build_url.sh b/Utils/gitlab_triggers/trigger_build_url.sh old mode 100644 new mode 100755 diff --git a/Utils/gitlab_triggers/trigger_build_with_ttl.sh b/Utils/gitlab_triggers/trigger_build_with_ttl.sh index 66a4ef9c0b45..2b6bfb48fe2a 100755 --- a/Utils/gitlab_triggers/trigger_build_with_ttl.sh +++ b/Utils/gitlab_triggers/trigger_build_with_ttl.sh @@ -42,7 +42,8 @@ if [ -z "$_ci_token" ]; then exit 1 fi -source Utils/gitlab_triggers/trigger_build_url.sh +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source ${SCRIPT_DIR}/trigger_build_url.sh curl -k --request POST \ --form token="${_ci_token}" \ diff --git a/Utils/gitlab_triggers/trigger_content_instance_testing_build.sh b/Utils/gitlab_triggers/trigger_content_instance_testing_build.sh index 09b1d7f833fe..ce205a62f559 100755 --- a/Utils/gitlab_triggers/trigger_content_instance_testing_build.sh +++ b/Utils/gitlab_triggers/trigger_content_instance_testing_build.sh @@ -1,4 +1,4 @@ -c# !/usr/bin/env bash +#!/usr/bin/env bash # This script triggers an instance-testing job in gitlab-CI. # For this script to work you will need to use a trigger token (see here for more about that: https://code.pan.run/help/ci/triggers/README#trigger-token) # disable-secrets-detection @@ -6,8 +6,7 @@ c# !/usr/bin/env bash # This script takes the gitlab-ci trigger token as first parameter and the branch name as an optional second parameter (the default is the current branch). # Ways to run this script are: -# 1. Utils/gitlab_triggers/trigger_content_nightly_build.sh -# 2. Utils/gitlab_triggers/trigger_content_nightly_build.sh +trigger_content_nightly_build.sh [] if [[ "$#" -lt 1 ]]; then echo "Usage: $0 [current-branch as default]" echo "Get the trigger token from here https://vault.paloaltonetworks.local/home#R2VuZXJpY1NlY3JldERldGFpbHM6RGF0YVZhdWx0OmIyMzJiNDU0LWEzOWMtNGY5YS1hMTY1LTQ4YjRlYzM1OTUxMzpSZWNvcmRJbmRleDowOklzVHJ1bmNhdGVk" # disable-secrets-detection @@ -15,8 +14,9 @@ if [[ "$#" -lt 1 ]]; then fi _gitlab_token=$1 -[ -n "$2" ] && _branch="$2" || _branch="$(git branch --show-current)" +[ -n "$2" ] && _branch="$2" || _branch="$(git branch --show-current)" -source Utils/gitlab_triggers/trigger_build_url.sh +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source ${SCRIPT_DIR}/trigger_build_url.sh curl "$BUILD_TRIGGER_URL" -F "ref=$_branch" -F "token=$_gitlab_token" -F "variables[INSTANCE_TESTS]=true" -F "variables[IFRA_ENV_TYPE]=Server 5.5" | jq diff --git a/Utils/gitlab_triggers/trigger_content_nightly_build.sh b/Utils/gitlab_triggers/trigger_content_nightly_build.sh index 7aecafc1315a..714995407a41 100755 --- a/Utils/gitlab_triggers/trigger_content_nightly_build.sh +++ b/Utils/gitlab_triggers/trigger_content_nightly_build.sh @@ -6,8 +6,7 @@ # This script requires the gitlab-ci trigger token. The branch to run against is an optional second parameter (the default is the current branch). The slack channel to send messages to is an optional third parameter (the default is the 'dmst-build-test') # Ways to run this script are: -# 1. Utils/gitlab_triggers/trigger_content_nightly_build.sh -ct -b -ch -# 2. Utils/gitlab_triggers/trigger_content_nightly_build.sh -ct +trigger_content_nightly_build.sh -ct [-b -ch ] if [ "$#" -lt "1" ]; then echo "Usage: $0 -ct @@ -61,7 +60,8 @@ if [ -z "$_ci_token" ]; then exit 1 fi -source Utils/gitlab_triggers/trigger_build_url.sh +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source ${SCRIPT_DIR}/trigger_build_url.sh curl "$BUILD_TRIGGER_URL" --form "ref=${_branch}" --form "token=${_ci_token}" \ --form "variables[OVERRIDE_SDK_REF]=${DEMISTO_SDK_NIGHTLY}" \ diff --git a/Utils/gitlab_triggers/trigger_upload_flow_build.sh b/Utils/gitlab_triggers/trigger_upload_flow_build.sh index 93ffa236be4f..b3af6418af97 100755 --- a/Utils/gitlab_triggers/trigger_upload_flow_build.sh +++ b/Utils/gitlab_triggers/trigger_upload_flow_build.sh @@ -92,7 +92,8 @@ if [ -n "$_force" ]; then _variables="variables[FORCE_BUCKET_UPLOAD]=true" fi -source Utils/gitlab_triggers/trigger_build_url.sh +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source ${SCRIPT_DIR}/trigger_build_url.sh curl -k -v --request POST \ --form token="${_ci_token}" \