diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile index 631f9e377a..9d96105478 100644 --- a/jenkins/gradle/gradle-check.jenkinsfile +++ b/jenkins/gradle/gradle-check.jenkinsfile @@ -70,7 +70,8 @@ pipeline { [key: 'pr_title', value: '$.pr_title'], [key: 'pr_number', value: '$.pr_number'], [key: 'post_merge_action', value: '$.post_merge_action'], - [key: 'pr_owner', value: '$.pr_owner'] + [key: 'pr_owner', value: '$.pr_owner'], + [key: 'exclude_tasks', value: '$.exclude_tasks', defaultValue: ''] ], tokenCredentialId: 'jenkins-gradle-check-generic-webhook-token', causeString: 'Triggered by PR on OpenSearch core repository', @@ -134,7 +135,8 @@ pipeline { gitRepoUrl: "${pr_from_clone_url}", gitReference: "${pr_from_sha}", bwcCheckoutAlign: "${bwc_checkout_align}", - scope: "all" + scope: "all", + excludeTasks: "${exclude_tasks}" ) } else { @@ -146,7 +148,8 @@ pipeline { gitRepoUrl: "${GIT_REPO_URL}", gitReference: "${GIT_REFERENCE}", bwcCheckoutAlign: "${bwc_checkout_align}", - scope: "all" + scope: "all", + excludeTasks: "${exclude_tasks}" ) } diff --git a/scripts/gradle/gradle-check.sh b/scripts/gradle/gradle-check.sh index 07d2ea5065..09f19a28f7 100755 --- a/scripts/gradle/gradle-check.sh +++ b/scripts/gradle/gradle-check.sh @@ -16,8 +16,9 @@ JENKINS_URL="https://build.ci.opensearch.org" TRIGGER_TOKEN="" GITHUB_USER="" GITHUB_TOKEN="" +EXCLUDE_TASKS="" -while getopts "u:t:p:" opt; do +while getopts "u:t:p:e:" opt; do case $opt in t) TRIGGER_TOKEN="$OPTARG" @@ -28,6 +29,9 @@ while getopts "u:t:p:" opt; do p) GITHUB_TOKEN="$OPTARG" ;; + e) + EXCLUDE_TASKS="$OPTARG" + ;; \?) echo "Invalid option: -$OPTARG" >&2 exit 1 @@ -59,7 +63,7 @@ TIMEPASS=0 TIMEOUT=7200 RESULT="null" PR_TITLE_NEW=`echo $pr_title | tr -dc '[:alnum:] ' | tr '[:upper:]' '[:lower:]'` -PAYLOAD_JSON="{\"pr_from_sha\": \"$pr_from_sha\", \"pr_from_clone_url\": \"$pr_from_clone_url\", \"pr_to_clone_url\": \"$pr_to_clone_url\", \"pr_title\": \"$PR_TITLE_NEW\", \"pr_number\": \"$pr_number\", \"post_merge_action\": \"$post_merge_action\", \"pr_owner\": \"$pr_owner\"}" +PAYLOAD_JSON="{\"pr_from_sha\": \"$pr_from_sha\", \"pr_from_clone_url\": \"$pr_from_clone_url\", \"pr_to_clone_url\": \"$pr_to_clone_url\", \"pr_title\": \"$PR_TITLE_NEW\", \"pr_number\": \"$pr_number\", \"post_merge_action\": \"$post_merge_action\", \"pr_owner\": \"$pr_owner\", \"exclude_tasks\": \"$EXCLUDE_TASKS\"}" perform_curl_and_process_with_jq() { local url=$1