From 600bbc16ec0705d5528a161d97d276877245b15c Mon Sep 17 00:00:00 2001 From: Sai Shanmukha Date: Wed, 15 Jul 2026 14:47:06 -0400 Subject: [PATCH 1/4] Update kind tests to custom gen3-workflow branch --- .github/workflows/integration_tests.yaml | 1 + .github/workflows/integration_tests_on_kind.yaml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index 19f92b879..41426406d 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -18,6 +18,7 @@ jobs: uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master with: WORKING_DIR: gen3-integration-tests + HELM_BRANCH: copy/pr-635 secrets: CI_TEST_ORCID_USERID: ${{ secrets.CI_TEST_ORCID_USERID }} CI_TEST_ORCID_PASSWORD: ${{ secrets.CI_TEST_ORCID_PASSWORD }} diff --git a/.github/workflows/integration_tests_on_kind.yaml b/.github/workflows/integration_tests_on_kind.yaml index 87befc18d..7fe7b68b8 100644 --- a/.github/workflows/integration_tests_on_kind.yaml +++ b/.github/workflows/integration_tests_on_kind.yaml @@ -17,13 +17,14 @@ permissions: jobs: integration_tests: name: Integration tests - uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master + uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@nss10-custom-gitops-branch with: WORKING_DIR: gen3-integration-tests EXTERNAL_TO_CTDS: "true" SERVICE_TO_TEST: gen3_workflow + HELM_BRANCH: copy/pr-635 SETUP_SCRIPT_1: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/master/.github/workflows/integration_tests_on_kind/ci_start_kind_cluster.sh - SETUP_SCRIPT_2: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/master/.github/workflows/integration_tests_on_kind/ci_override_config_and_start_minio.sh + SETUP_SCRIPT_2: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/chore/update_kind_ci/.github/workflows/integration_tests_on_kind/ci_override_config_and_start_minio.sh SETUP_SCRIPT_3: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/master/.github/workflows/integration_tests_on_kind/ci_expose_kind_cluster.sh secrets: CI_TEST_ORCID_USERID: "" From f970118160520ee5a15ea988262d87062c6bb4ff Mon Sep 17 00:00:00 2001 From: Sai Shanmukha Date: Fri, 24 Jul 2026 15:23:17 -0500 Subject: [PATCH 2/4] Point everything to master to test it after merge. --- .github/workflows/integration_tests.yaml | 1 - .github/workflows/integration_tests_on_kind.yaml | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml index 41426406d..19f92b879 100644 --- a/.github/workflows/integration_tests.yaml +++ b/.github/workflows/integration_tests.yaml @@ -18,7 +18,6 @@ jobs: uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master with: WORKING_DIR: gen3-integration-tests - HELM_BRANCH: copy/pr-635 secrets: CI_TEST_ORCID_USERID: ${{ secrets.CI_TEST_ORCID_USERID }} CI_TEST_ORCID_PASSWORD: ${{ secrets.CI_TEST_ORCID_PASSWORD }} diff --git a/.github/workflows/integration_tests_on_kind.yaml b/.github/workflows/integration_tests_on_kind.yaml index 7fe7b68b8..87befc18d 100644 --- a/.github/workflows/integration_tests_on_kind.yaml +++ b/.github/workflows/integration_tests_on_kind.yaml @@ -17,14 +17,13 @@ permissions: jobs: integration_tests: name: Integration tests - uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@nss10-custom-gitops-branch + uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master with: WORKING_DIR: gen3-integration-tests EXTERNAL_TO_CTDS: "true" SERVICE_TO_TEST: gen3_workflow - HELM_BRANCH: copy/pr-635 SETUP_SCRIPT_1: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/master/.github/workflows/integration_tests_on_kind/ci_start_kind_cluster.sh - SETUP_SCRIPT_2: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/chore/update_kind_ci/.github/workflows/integration_tests_on_kind/ci_override_config_and_start_minio.sh + SETUP_SCRIPT_2: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/master/.github/workflows/integration_tests_on_kind/ci_override_config_and_start_minio.sh SETUP_SCRIPT_3: https://raw.githubusercontent.com/uc-cdis/gen3-workflow/refs/heads/master/.github/workflows/integration_tests_on_kind/ci_expose_kind_cluster.sh secrets: CI_TEST_ORCID_USERID: "" From 40b98952f71a4d7ae5ac104266c994aaa713b715 Mon Sep 17 00:00:00 2001 From: Sai Shanmukha Date: Fri, 24 Jul 2026 15:24:06 -0500 Subject: [PATCH 3/4] Dummy change to trigger CI --- gen3-integration-tests/tests/test_gen3_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen3-integration-tests/tests/test_gen3_workflow.py b/gen3-integration-tests/tests/test_gen3_workflow.py index 272fc9e09..cf93d12b1 100644 --- a/gen3-integration-tests/tests/test_gen3_workflow.py +++ b/gen3-integration-tests/tests/test_gen3_workflow.py @@ -60,8 +60,8 @@ def _nextflow_parse_completed_line(log_line): "workDir": "-", "workDirProtocol": "-", "exit_code": "-", - "status": "-", "timestamp": "-", + "status": "-", } log_regex = ( r"(?P\w{3}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}) .*?" From 0073609fe7131189b13f0d259aefe7ebdad11ddc Mon Sep 17 00:00:00 2001 From: Sai Shanmukha Date: Fri, 24 Jul 2026 15:34:38 -0500 Subject: [PATCH 4/4] Empty commit to retrigger CI