From d5e7844288a74d9677c7b0f08921ef5ad6239d94 Mon Sep 17 00:00:00 2001 From: kart2bc Date: Tue, 20 May 2025 10:29:22 -0400 Subject: [PATCH 01/10] test pr run --- .github/gh-config-template/gh_template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/gh-config-template/gh_template.yml b/.github/gh-config-template/gh_template.yml index 03f203557..684f1550f 100644 --- a/.github/gh-config-template/gh_template.yml +++ b/.github/gh-config-template/gh_template.yml @@ -1,6 +1,6 @@ #@ load("@ytt:data", "data") #@ load("ytt-helpers.star", "helpers") - +# test commit name: unit-integration-tests on: From fd5b06b1d2bd807cf8d3029caab0bcb728ca8f18 Mon Sep 17 00:00:00 2001 From: kart2bc Date: Tue, 20 May 2025 10:40:22 -0400 Subject: [PATCH 02/10] test pr run --- .github/gh-config-template/gh_template.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/gh-config-template/gh_template.yml b/.github/gh-config-template/gh_template.yml index 684f1550f..11c537f56 100644 --- a/.github/gh-config-template/gh_template.yml +++ b/.github/gh-config-template/gh_template.yml @@ -4,10 +4,13 @@ name: unit-integration-tests on: - push: - branches: - - develop pull_request: + branches: + - test-gh + types: + - opened + - reopened + - synchronize env: MAPPING: | From 932ec4ebfaeaef0eb6834f6857aacd717f4c19d9 Mon Sep 17 00:00:00 2001 From: kart2bc Date: Tue, 20 May 2025 12:39:43 -0400 Subject: [PATCH 03/10] test pr run --- .github/workflows/tests-workflow.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index 2d177a504..f5cbdd5d3 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -1,10 +1,12 @@ name: unit-integration-tests on: - push: - branches: - - develop pull_request: - + branches: + - test-gh + types: + - opened + - reopened + - synchronize env: MAPPING: | build_nats_server=src/code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2 From cac66f1a4b386c07ed1edb1c772ac452502f3b35 Mon Sep 17 00:00:00 2001 From: kart2bc Date: Tue, 20 May 2025 13:21:22 -0400 Subject: [PATCH 04/10] gh action - pr only for develop branch --- .github/gh-config-template/gh_template.yml | 7 +++++-- .github/workflows/tests-workflow.yml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/gh-config-template/gh_template.yml b/.github/gh-config-template/gh_template.yml index 03f203557..4bea860f4 100644 --- a/.github/gh-config-template/gh_template.yml +++ b/.github/gh-config-template/gh_template.yml @@ -4,10 +4,13 @@ name: unit-integration-tests on: - push: + pull_request: branches: - develop - pull_request: + types: + - opened + - reopened + - synchronize env: MAPPING: | diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index f5cbdd5d3..082fa6412 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -2,7 +2,7 @@ name: unit-integration-tests on: pull_request: branches: - - test-gh + - develop types: - opened - reopened From 1fda1f4f9739a0dd97a5bbca8abb844b8ea8cce7 Mon Sep 17 00:00:00 2001 From: kart2bc Date: Tue, 20 May 2025 15:17:01 -0400 Subject: [PATCH 05/10] gh action - pr only for develop branch --- .github/gh-config-template/gh_template.yml | 22 +++++++++++++++++----- .github/workflows/tests-workflow.yml | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/gh-config-template/gh_template.yml b/.github/gh-config-template/gh_template.yml index 4bea860f4..bdbfdaf75 100644 --- a/.github/gh-config-template/gh_template.yml +++ b/.github/gh-config-template/gh_template.yml @@ -4,7 +4,7 @@ name: unit-integration-tests on: - pull_request: + pull_request_target: branches: - develop types: @@ -80,7 +80,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-mysql-5.7 + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-mysql-5.7 + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 @@ -106,7 +109,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-build + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-build + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 @@ -131,7 +137,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-postgres + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-postgres + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 @@ -156,7 +165,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-mysql-8.0 + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-mysql-8.0 + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index 082fa6412..9a92e665c 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -1,6 +1,6 @@ name: unit-integration-tests on: - pull_request: + pull_request_target: branches: - develop types: From 98da348615187e33860cb613b1e9ac3768bd25c8 Mon Sep 17 00:00:00 2001 From: kart2bc Date: Tue, 20 May 2025 15:22:33 -0400 Subject: [PATCH 06/10] gh action - pr only for develop branch --- .github/gh-config-template/gh_template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/gh-config-template/gh_template.yml b/.github/gh-config-template/gh_template.yml index bdbfdaf75..bab32c75b 100644 --- a/.github/gh-config-template/gh_template.yml +++ b/.github/gh-config-template/gh_template.yml @@ -5,8 +5,6 @@ name: unit-integration-tests on: pull_request_target: - branches: - - develop types: - opened - reopened From 0e15dc41714f0b0f35643c64da8043f4579ec185 Mon Sep 17 00:00:00 2001 From: Karthick Udayakumar Date: Tue, 20 May 2025 15:35:34 -0400 Subject: [PATCH 07/10] Update tests-workflow.yml --- .github/workflows/tests-workflow.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index 9a92e665c..4ebe94e7c 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -1,8 +1,6 @@ name: unit-integration-tests on: pull_request_target: - branches: - - develop types: - opened - reopened From 708a242594fdfe15ea956fd197ea5af4f44b4b90 Mon Sep 17 00:00:00 2001 From: Karthick Udayakumar Date: Tue, 20 May 2025 16:45:35 -0400 Subject: [PATCH 08/10] Update tests-workflow.yml --- .github/workflows/tests-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index 4ebe94e7c..80a0ba3c7 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -34,8 +34,8 @@ jobs: - name: routing-release-repo uses: actions/checkout@v4 with: - repository: cloudfoundry/routing-release.git - ref: develop + repository: ${{ github.event.pull_request.head.repo.full_name }} + ref: ${{ github.event.pull_request.head.ref }} submodules: recursive path: repo - name: Check out wg-appruntime code From 51aacf3f95fac7d2ed879c74c653f9598d636cec Mon Sep 17 00:00:00 2001 From: kart2bc Date: Wed, 7 May 2025 11:11:10 -0400 Subject: [PATCH 09/10] add pull request target to develop branch and support to pull gcp image --- .github/gh-config-template/gh_template.yml | 45 +++++++++++++++------- .github/workflows/tests-workflow.yml | 33 +++++++++++----- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/.github/gh-config-template/gh_template.yml b/.github/gh-config-template/gh_template.yml index 03f203557..77c14ad93 100644 --- a/.github/gh-config-template/gh_template.yml +++ b/.github/gh-config-template/gh_template.yml @@ -4,10 +4,14 @@ name: unit-integration-tests on: - push: - branches: - - develop - pull_request: + +pull_request_target: + branches: + - develop + types: + - opened + - reopened + - synchronize env: MAPPING: | @@ -39,8 +43,8 @@ jobs: - name: routing-release-repo uses: actions/checkout@v4 with: - repository: cloudfoundry/routing-release.git - ref: github-action + repository: ${{ github.event.pull_request.head.repo.full_name }} + ref: ${{ github.event.pull_request.head.ref }} submodules: recursive path: repo - name: Check out wg-appruntime code @@ -63,7 +67,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-mysql-5.7 + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-build + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 @@ -77,15 +84,18 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-mysql-5.7 + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-mysql-5.7 + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 with: name: repo - run: | - tar -xzvf repo-artifact.tar.gz - tar -xzvf ci-artifact.tar.gz + tar -xzvf repo-artifact.tar.gz + tar -xzvf ci-artifact.tar.gz - name: build binaries run: | export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml" @@ -103,7 +113,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-build + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-build + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 @@ -128,7 +141,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-postgres + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-postgres + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 @@ -153,7 +169,10 @@ jobs: runs-on: ubuntu-latest needs: repo-clone container: - image: cloudfoundry/tas-runtime-mysql-8.0 + image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-mysql-8.0 + credentials: + username: _json_key + password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }} steps: - name: Download artifact uses: actions/download-artifact@v4 diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index 2d177a504..503428767 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -1,10 +1,12 @@ name: unit-integration-tests on: - push: + pull_request_target: branches: - develop - pull_request: - + types: + - opened + - reopened + - synchronize env: MAPPING: | build_nats_server=src/code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2 @@ -34,8 +36,8 @@ jobs: - name: routing-release-repo uses: actions/checkout@v4 with: - repository: cloudfoundry/routing-release.git - ref: develop + repository: ${{ github.event.pull_request.head.repo.full_name }} + ref: ${{ github.event.pull_request.head.ref }} submodules: recursive path: repo - name: Check out wg-appruntime code @@ -67,7 +69,9 @@ jobs: uses: actions/download-artifact@v4 with: name: repo - - run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n" + - run: | + tar -xzvf repo-artifact.tar.gz + tar -xzvf ci-artifact.tar.gz - name: template-tests run: | "${GITHUB_WORKSPACE}"/ci/shared/tasks/run-tests-templates/task.bash @@ -84,7 +88,7 @@ jobs: uses: actions/download-artifact@v4 with: name: repo - - run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n" + - run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz \n" - name: build binaries run: | export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml" @@ -94,18 +98,21 @@ jobs: DIR: src/code.cloudfoundry.org/gorouter DB: mysql run: | + "${GITHUB_WORKSPACE}"/ci/routing-release/helpers/configure-binaries.bash "${GITHUB_WORKSPACE}"/ci/shared/tasks/run-bin-test/task.bash --keep-going --trace -r --fail-on-pending --randomize-all --nodes=7 --race --timeout 30m --flake-attempts 2 - name: cf-tcp-router-mysql env: DIR: src/code.cloudfoundry.org/cf-tcp-router DB: mysql run: | + "${GITHUB_WORKSPACE}"/ci/routing-release/helpers/configure-binaries.bash "${GITHUB_WORKSPACE}"/ci/shared/tasks/run-bin-test/task.bash --keep-going --trace -r --fail-on-pending --randomize-all --nodes=7 --race --timeout 30m --flake-attempts 2 - name: routing-api-mysql env: DIR: src/code.cloudfoundry.org/routing-api DB: mysql run: | + "${GITHUB_WORKSPACE}"/ci/routing-release/helpers/configure-binaries.bash "${GITHUB_WORKSPACE}"/ci/shared/tasks/run-bin-test/task.bash --keep-going --trace -r --fail-on-pending --randomize-all --nodes=7 --race --timeout 30m --flake-attempts 2 test-repos-withoutdb: runs-on: ubuntu-latest @@ -120,7 +127,9 @@ jobs: uses: actions/download-artifact@v4 with: name: repo - - run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n" + - run: | + tar -xzvf repo-artifact.tar.gz + tar -xzvf ci-artifact.tar.gz - name: build binaries run: | export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml" @@ -156,7 +165,9 @@ jobs: uses: actions/download-artifact@v4 with: name: repo - - run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n" + - run: | + tar -xzvf repo-artifact.tar.gz + tar -xzvf ci-artifact.tar.gz - name: build binaries run: | export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml" @@ -192,7 +203,9 @@ jobs: uses: actions/download-artifact@v4 with: name: repo - - run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n" + - run: | + tar -xzvf repo-artifact.tar.gz + tar -xzvf ci-artifact.tar.gz - name: build binaries run: | export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml" From 87ae403a337ab82de3eb2ef613ef55d359fb17fd Mon Sep 17 00:00:00 2001 From: Karthick Udayakumar Date: Tue, 20 May 2025 22:15:46 -0400 Subject: [PATCH 10/10] Update tests-workflow.yml --- .github/workflows/tests-workflow.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests-workflow.yml b/.github/workflows/tests-workflow.yml index 80a0ba3c7..1f3090669 100644 --- a/.github/workflows/tests-workflow.yml +++ b/.github/workflows/tests-workflow.yml @@ -2,9 +2,7 @@ name: unit-integration-tests on: pull_request_target: types: - - opened - - reopened - - synchronize + - labeled env: MAPPING: | build_nats_server=src/code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2 @@ -29,6 +27,7 @@ env: FUNCTIONS: ci/routing-release/helpers/configure-binaries.bash jobs: repo-clone: + if: github.event.label.name == 'ready-to-run' runs-on: ubuntu-latest steps: - name: routing-release-repo