From c7ced4a41636e5c473bde7d00105b9a249ddfe07 Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:52:42 -0500 Subject: [PATCH 1/3] More logs --- gen3-integration-tests/conftest.py | 2 +- gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh | 4 +++- .../gen3_ci/scripts/prepare_ci_environment.py | 2 +- gen3-integration-tests/utils/misc.py | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gen3-integration-tests/conftest.py b/gen3-integration-tests/conftest.py index c6e90d2c8..0e31f0752 100644 --- a/gen3-integration-tests/conftest.py +++ b/gen3-integration-tests/conftest.py @@ -240,7 +240,7 @@ def pytest_runtest_makereport(item): def pytest_unconfigure(config): - if pytest.frontend_url: + if hasattr(pytest, "frontend_url") and pytest.frontend_url: ff_dir = Path(__file__).parent / pytest.frontend_commons_name shutil.rmtree(ff_dir, ignore_errors=True) # Skip running code if --collect-only is passed diff --git a/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh b/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh index c89ba3f2d..18d0b5b84 100755 --- a/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh +++ b/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh @@ -49,7 +49,9 @@ tail -n +2 "$USERS_FILE" | while IFS="," read -r username email; do fi # Request API key - RESPONSE=$(curl -o "$OUTPUT_DIR/${NAMESPACE}_${username}.json" -w "%{http_code}" -X POST "$HOSTNAME_PROTOCOL://$HOSTNAME/user/credentials/api" \ + ENDPOINT="$HOSTNAME_PROTOCOL://$HOSTNAME/user/credentials/api" + echo "Hitting endpoint '$ENDPOINT' with token '$$ACCESS_TOKEN'" + RESPONSE=$(curl -o "$OUTPUT_DIR/${NAMESPACE}_${username}.json" -w "%{http_code}" -X POST "$ENDPOINT" \ -H "Authorization: bearer $ACCESS_TOKEN" \ -H "Content-Type: application/json" \ -H "Accept: application/json") diff --git a/gen3-integration-tests/gen3_ci/scripts/prepare_ci_environment.py b/gen3-integration-tests/gen3_ci/scripts/prepare_ci_environment.py index 625a12414..28bf43d7d 100644 --- a/gen3-integration-tests/gen3_ci/scripts/prepare_ci_environment.py +++ b/gen3-integration-tests/gen3_ci/scripts/prepare_ci_environment.py @@ -178,7 +178,7 @@ def modify_env_for_test_repo_pr(namespace): return setup_env_for_helm(arguments) -@retry(times=10, delay=30, exceptions=(Exception)) +@retry(times=6, delay=30, exceptions=(Exception)) def generate_api_keys_for_test_users(): cmd = [ (HELM_SCRIPTS_PATH_OBJECT / "generate_api_keys.sh"), diff --git a/gen3-integration-tests/utils/misc.py b/gen3-integration-tests/utils/misc.py index e79cf5d95..cee258d26 100644 --- a/gen3-integration-tests/utils/misc.py +++ b/gen3-integration-tests/utils/misc.py @@ -89,9 +89,9 @@ def newfn(*args, **kwargs): while attempt <= times: try: return func(*args, **kwargs) - except exceptions: + except exceptions as e: print( - f"Errored when trying to run '{func.__name__}', attempt {attempt} of {times}" + f"Errored when trying to run '{func.__name__}', attempt {attempt} of {times}: {e}" ) attempt += 1 time.sleep(delay) From e5ddb6ca50315c1dd049ef8bded4391c368fadb1 Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:53:43 -0500 Subject: [PATCH 2/3] fix --- gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh b/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh index 18d0b5b84..9bb7efadd 100755 --- a/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh +++ b/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh @@ -50,7 +50,7 @@ tail -n +2 "$USERS_FILE" | while IFS="," read -r username email; do # Request API key ENDPOINT="$HOSTNAME_PROTOCOL://$HOSTNAME/user/credentials/api" - echo "Hitting endpoint '$ENDPOINT' with token '$$ACCESS_TOKEN'" + echo "Hitting endpoint '$ENDPOINT' with token '$ACCESS_TOKEN'" RESPONSE=$(curl -o "$OUTPUT_DIR/${NAMESPACE}_${username}.json" -w "%{http_code}" -X POST "$ENDPOINT" \ -H "Authorization: bearer $ACCESS_TOKEN" \ -H "Content-Type: application/json" \ From 8ade51252321d2f98460cd0d2a4e977688535585 Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Fri, 5 Jun 2026 14:31:35 -0500 Subject: [PATCH 3/3] update --- gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh | 2 +- gen3-integration-tests/utils/misc.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh b/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh index 9bb7efadd..fddb770eb 100755 --- a/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh +++ b/gen3-integration-tests/gen3_ci/scripts/generate_api_keys.sh @@ -50,7 +50,7 @@ tail -n +2 "$USERS_FILE" | while IFS="," read -r username email; do # Request API key ENDPOINT="$HOSTNAME_PROTOCOL://$HOSTNAME/user/credentials/api" - echo "Hitting endpoint '$ENDPOINT' with token '$ACCESS_TOKEN'" + echo "Got access token, now getting API key from '$ENDPOINT'" RESPONSE=$(curl -o "$OUTPUT_DIR/${NAMESPACE}_${username}.json" -w "%{http_code}" -X POST "$ENDPOINT" \ -H "Authorization: bearer $ACCESS_TOKEN" \ -H "Content-Type: application/json" \ diff --git a/gen3-integration-tests/utils/misc.py b/gen3-integration-tests/utils/misc.py index cee258d26..e79cf5d95 100644 --- a/gen3-integration-tests/utils/misc.py +++ b/gen3-integration-tests/utils/misc.py @@ -89,9 +89,9 @@ def newfn(*args, **kwargs): while attempt <= times: try: return func(*args, **kwargs) - except exceptions as e: + except exceptions: print( - f"Errored when trying to run '{func.__name__}', attempt {attempt} of {times}: {e}" + f"Errored when trying to run '{func.__name__}', attempt {attempt} of {times}" ) attempt += 1 time.sleep(delay)