From 1ba2d4f5f8da6f03c00409e78ef2fead2a74ac94 Mon Sep 17 00:00:00 2001 From: Dmytro Bogatov <dmytro@dbogatov.org> Date: Sun, 25 Jun 2023 21:54:28 -0400 Subject: [PATCH] Fix CI_COMMIT_BRANCH . --- latex-review-apps/review.yml | 6 +++--- latex-review-apps/stop-review.yml | 4 ++-- quality-security/accessibility.yml | 2 +- quality-security/dast.yml | 2 +- quality-security/performance.yml | 2 +- scripts/tidy.sh | 2 +- simple-website/blc.yml | 2 +- simple-website/bli.yml | 2 +- simple-website/review/review.yml | 6 +++--- simple-website/review/stop-review.yml | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/latex-review-apps/review.yml b/latex-review-apps/review.yml index 1bcb465..c4e4691 100644 --- a/latex-review-apps/review.yml +++ b/latex-review-apps/review.yml @@ -11,15 +11,15 @@ review: ./generate-review-app.sh \ $NAME \ $CI_REGISTRY/$CI_PROJECT_PATH/review/$CI_COMMIT_REF_NAME \ - $CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org \ + $CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org \ $AUTHPASSWORD - source <(curl -s -k https://git.dbogatov.org/templates/ci-snippets/raw/master/setup-kubectl.sh) - kubectl --namespace=review delete secret $NAME-basic-auth || true - kubectl --namespace=review create secret generic $NAME-basic-auth --from-file=./out/auth - kubectl apply -R -f ./out environment: - name: review/$CI_BUILD_REF_NAME - url: https://$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org + name: review/$CI_COMMIT_BRANCH + url: https://$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org on_stop: stop_review auto_stop_in: 1 week rules: diff --git a/latex-review-apps/stop-review.yml b/latex-review-apps/stop-review.yml index 2c39aa6..ee3a2e2 100644 --- a/latex-review-apps/stop-review.yml +++ b/latex-review-apps/stop-review.yml @@ -9,7 +9,7 @@ stop_review: ./generate-review-app.sh \ $NAME \ $CI_REGISTRY/$CI_PROJECT_PATH/review/$CI_COMMIT_REF_NAME \ - $CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org \ + $CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org \ $AUTHPASSWORD - source <(curl -s -k https://git.dbogatov.org/templates/ci-snippets/raw/master/setup-kubectl.sh) - kubectl delete -R -f ./out @@ -18,7 +18,7 @@ stop_review: GIT_STRATEGY: none dependencies: [] environment: - name: review/$CI_BUILD_REF_NAME + name: review/$CI_COMMIT_BRANCH action: stop rules: - if: "$DISABLE_REGULAR_PIPELINE" diff --git a/quality-security/accessibility.yml b/quality-security/accessibility.yml index 1ed05d8..92e13e6 100644 --- a/quality-security/accessibility.yml +++ b/quality-security/accessibility.yml @@ -4,7 +4,7 @@ a11y: image: registry.gitlab.com/gitlab-org/ci-cd/accessibility:5.3.0-gitlab.3 variables: GIT_STRATEGY: none - a11y_urls: https://$AUTH$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org + a11y_urls: https://$AUTH$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org script: /gitlab-accessibility.sh $a11y_urls allow_failure: true artifacts: diff --git a/quality-security/dast.yml b/quality-security/dast.yml index 8c4258f..dd4ed1e 100644 --- a/quality-security/dast.yml +++ b/quality-security/dast.yml @@ -4,7 +4,7 @@ include: dast: stage: test variables: - DAST_WEBSITE: https://$AUTH$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org + DAST_WEBSITE: https://$AUTH$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org DAST_FULL_SCAN_ENABLED: "true" rules: - when: manual diff --git a/quality-security/performance.yml b/quality-security/performance.yml index 8b75bf3..8bde77c 100644 --- a/quality-security/performance.yml +++ b/quality-security/performance.yml @@ -6,7 +6,7 @@ browser_performance: variables: GIT_STRATEGY: none SITESPEED_OPTIONS: -n 1 -d 2 --visualMetrics false --video false - URL: https://$AUTH$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org/ + URL: https://$AUTH$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org/ rules: - when: manual allow_failure: true diff --git a/scripts/tidy.sh b/scripts/tidy.sh index 6d2fea7..8dc7d7b 100644 --- a/scripts/tidy.sh +++ b/scripts/tidy.sh @@ -8,7 +8,7 @@ FAIL=() for url in $TIDY_URLS do - curl -Ls https://$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org/$TIDY_PREFIX/$url$TIDY_SUFFIX | tidy $TIDY_CONFIG -e &> tidy.out || true + curl -Ls https://$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org/$TIDY_PREFIX/$url$TIDY_SUFFIX | tidy $TIDY_CONFIG -e &> tidy.out || true cat tidy.out if cat tidy.out | grep -q '\- Warning:' diff --git a/simple-website/blc.yml b/simple-website/blc.yml index 26ce9a9..20a56a2 100644 --- a/simple-website/blc.yml +++ b/simple-website/blc.yml @@ -9,7 +9,7 @@ blc: BLC_EXCLUDE: | --exclude *linkedin.* --exclude *facebook.* script: - - blc --filter-level 3 --input https://$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org/$BLC_INDEX -rog $BLC_EXCLUDE > blc.out || true + - blc --filter-level 3 --input https://$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org/$BLC_INDEX -rog $BLC_EXCLUDE > blc.out || true - cat blc.out - cat blc.out | grep 'Finished!' | tail -1 | grep '0 broken.' when: delayed diff --git a/simple-website/bli.yml b/simple-website/bli.yml index bf15f0e..cbcd945 100644 --- a/simple-website/bli.yml +++ b/simple-website/bli.yml @@ -8,7 +8,7 @@ bli: BLC_INDEX: "" BLC_EXCLUDE: "" script: - - bli inspect https://$AUTH$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org/$BLC_INDEX -r -t 30000 --reporters console,junit --ignore-skipped $BLC_EXCLUDE + - bli inspect https://$AUTH$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org/$BLC_INDEX -r -t 30000 --reporters console,junit --ignore-skipped $BLC_EXCLUDE when: delayed start_in: 30 seconds artifacts: diff --git a/simple-website/review/review.yml b/simple-website/review/review.yml index 2fe53d2..2c45ecc 100644 --- a/simple-website/review/review.yml +++ b/simple-website/review/review.yml @@ -12,15 +12,15 @@ review: ./generate-review-app.sh \ $NAME \ $CI_REGISTRY/$CI_PROJECT_PATH/review/$CI_COMMIT_REF_NAME \ - $CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org \ + $CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org \ $AUTHPASSWORD - source <(curl -k -s https://git.dbogatov.org/templates/ci-snippets/raw/master/setup-kubectl.sh) - kubectl --namespace=review delete secret $NAME-basic-auth || true - kubectl --namespace=review create secret generic $NAME-basic-auth --from-file=./out/auth - kubectl apply -R -f ./out environment: - name: review/$CI_BUILD_REF_NAME - url: https://$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org + name: review/$CI_COMMIT_BRANCH + url: https://$CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org on_stop: stop_review auto_stop_in: 1 week only: diff --git a/simple-website/review/stop-review.yml b/simple-website/review/stop-review.yml index e63e82b..99f81b7 100644 --- a/simple-website/review/stop-review.yml +++ b/simple-website/review/stop-review.yml @@ -10,7 +10,7 @@ stop_review: ./generate-review-app.sh \ $NAME \ $CI_REGISTRY/$CI_PROJECT_PATH/review/$CI_COMMIT_REF_NAME \ - $CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org \ + $CI_COMMIT_BRANCH-$CI_PROJECT_NAME.review.dbogatov.org \ $AUTHPASSWORD - source <(curl -k -s https://git.dbogatov.org/templates/ci-snippets/raw/master/setup-kubectl.sh) - kubectl delete -R -f ./out @@ -19,7 +19,7 @@ stop_review: GIT_STRATEGY: none dependencies: [] environment: - name: review/$CI_BUILD_REF_NAME + name: review/$CI_COMMIT_BRANCH action: stop only: - branches -- GitLab