From b6fb9e754630ec1649cd27a3dd33da66f547d628 Mon Sep 17 00:00:00 2001 From: Mondo Diaz Date: Tue, 3 Feb 2026 11:05:04 -0600 Subject: [PATCH] Use same variable pattern as integration tests for reset job --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57426d8..6452cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -224,7 +224,7 @@ reset_feature: - pip install --index-url "$PIP_INDEX_URL" httpx script: # Debug: Check if variable is set at shell level - - echo "DEV_ADMIN_PASSWORD length at shell level:${#DEV_ADMIN_PASSWORD}" + - echo "RESET_ADMIN_PASSWORD length at shell level:${#RESET_ADMIN_PASSWORD}" - | python - <<'RESET_SCRIPT' import httpx @@ -232,10 +232,10 @@ reset_feature: import sys BASE_URL = f"https://orchard-{os.environ['CI_COMMIT_REF_SLUG']}.common.global.bsf.tools" - PASSWORD_RAW = os.environ.get("DEV_ADMIN_PASSWORD") + PASSWORD_RAW = os.environ.get("RESET_ADMIN_PASSWORD") if not PASSWORD_RAW: - print("ERROR: DEV_ADMIN_PASSWORD not set") + print("ERROR: RESET_ADMIN_PASSWORD not set") sys.exit(1) # Debug: check for hidden characters @@ -274,7 +274,8 @@ reset_feature: sys.exit(1) RESET_SCRIPT variables: - DEV_ADMIN_PASSWORD: $DEV_ADMIN_PASSWORD + # Use same pattern as integration_test_feature - create new variable from CI variable + RESET_ADMIN_PASSWORD: $DEV_ADMIN_PASSWORD rules: - if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != "main"' when: on_success