@@ -21,30 +21,28 @@ check-ci-visibility-label:
2121 - |
2222 # Source utility functions
2323 source .gitlab/ci_visibility_utils.sh
24+ touch ci-visibility-pr.env
2425
2526 # Get PR number
26- if ! PR_NUMBER =$(get_pr_number "${CI_COMMIT_BRANCH}"); then
27+ if ! CI_VIS_PR_NUMBER =$(get_pr_number "${CI_COMMIT_BRANCH}"); then
2728 echo "No open PR found for branch ${CI_COMMIT_BRANCH}"
28- exit 1
29+ exit 0
2930 fi
3031
31- echo "Found PR #${PR_NUMBER }"
32+ echo "Found PR #${CI_VIS_PR_NUMBER }"
3233
3334 # Check if PR has the CI visibility label
34- if pr_has_label "$PR_NUMBER" "comp: ci visibility"; then
35- echo "PR_NUMBER=${PR_NUMBER}" > pr.env
36- echo "PR #${PR_NUMBER} detected as CI Visibility PR"
37- exit 0
35+ if pr_has_label "$CI_VIS_PR_NUMBER" "comp: ci visibility"; then
36+ echo "CI_VIS_PR_NUMBER=${CI_VIS_PR_NUMBER}" > ci-visibility-pr.env
37+ echo "PR #${CI_VIS_PR_NUMBER} detected as CI Visibility PR"
3838 else
39- echo "PR #${PR_NUMBER} not a CI Visibility PR, ignoring trigger"
40- exit 1
39+ echo "PR #${CI_VIS_PR_NUMBER} not a CI Visibility PR, ignoring trigger"
4140 fi
4241 after_script :
4342 - dd-octo-sts revoke -t $(cat github-token.txt) || true
4443 artifacts :
4544 reports :
46- dotenv : pr.env
47- allow_failure : true
45+ dotenv : ci-visibility-pr.env
4846 retry :
4947 max : 2
5048 when : always
@@ -57,7 +55,7 @@ run-ci-visibility-test-environment:
5755 rules :
5856 - if : ' $POPULATE_CACHE'
5957 when : never
60- - if : ' $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH !~ /^(master|release\/)/'
58+ - if : ' $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH !~ /^(master|release\/)/ && $CI_VIS_PR_NUMBER '
6159 when : on_success
6260 trigger :
6361 project : DataDog/apm-reliability/test-environment
@@ -74,4 +72,4 @@ run-ci-visibility-test-environment:
7472 UPSTREAM_COMMIT_SHORT_SHA : $CI_COMMIT_SHORT_SHA
7573 TRACER_LANG : java
7674 JAVA_TRACER_REF_TO_TEST : $CI_COMMIT_BRANCH
77- JAVA_TRACER_PR_TO_TEST : $PR_NUMBER
75+ JAVA_TRACER_PR_TO_TEST : $CI_VIS_PR_NUMBER
0 commit comments