Skip to content

Commit 1aa10eb

Browse files
committed
add gcp registry to pull image
2 parents 98da348 + fd5b06b commit 1aa10eb

File tree

2 files changed

+34
-17
lines changed

2 files changed

+34
-17
lines changed

.github/gh-config-template/gh_template.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
name: unit-integration-tests
55

66
on:
7+
78
pull_request_target:
8-
types:
9-
- opened
10-
- reopened
11-
- synchronize
9+
branches:
10+
- develop
11+
types:
12+
- opened
13+
- reopened
14+
- synchronize
1215

1316
env:
1417
MAPPING: |
@@ -40,8 +43,8 @@ jobs:
4043
- name: routing-release-repo
4144
uses: actions/checkout@v4
4245
with:
43-
repository: cloudfoundry/routing-release.git
44-
ref: github-action
46+
repository: ${{ github.event.pull_request.head.repo.full_name }}
47+
ref: ${{ github.event.pull_request.head.ref }}
4548
submodules: recursive
4649
path: repo
4750
- name: Check out wg-appruntime code
@@ -64,7 +67,10 @@ jobs:
6467
runs-on: ubuntu-latest
6568
needs: repo-clone
6669
container:
67-
image: cloudfoundry/tas-runtime-mysql-5.7
70+
image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-build
71+
credentials:
72+
username: _json_key
73+
password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }}
6874
steps:
6975
- name: Download artifact
7076
uses: actions/download-artifact@v4
@@ -88,8 +94,8 @@ jobs:
8894
with:
8995
name: repo
9096
- run: |
91-
tar -xzvf repo-artifact.tar.gz
92-
tar -xzvf ci-artifact.tar.gz
97+
tar -xzvf repo-artifact.tar.gz
98+
tar -xzvf ci-artifact.tar.gz
9399
- name: build binaries
94100
run: |
95101
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"

.github/workflows/tests-workflow.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: unit-integration-tests
22
on:
33
pull_request_target:
44
branches:
5-
- develop
5+
- test-gh-1
66
types:
77
- opened
88
- reopened
@@ -36,8 +36,8 @@ jobs:
3636
- name: routing-release-repo
3737
uses: actions/checkout@v4
3838
with:
39-
repository: cloudfoundry/routing-release.git
40-
ref: develop
39+
repository: ${{ github.event.pull_request.head.repo.full_name }}
40+
ref: ${{ github.event.pull_request.head.ref }}
4141
submodules: recursive
4242
path: repo
4343
- name: Check out wg-appruntime code
@@ -69,7 +69,9 @@ jobs:
6969
uses: actions/download-artifact@v4
7070
with:
7171
name: repo
72-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
72+
- run: |
73+
tar -xzvf repo-artifact.tar.gz
74+
tar -xzvf ci-artifact.tar.gz
7375
- name: template-tests
7476
run: |
7577
"${GITHUB_WORKSPACE}"/ci/shared/tasks/run-tests-templates/task.bash
@@ -86,7 +88,7 @@ jobs:
8688
uses: actions/download-artifact@v4
8789
with:
8890
name: repo
89-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
91+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz \n"
9092
- name: build binaries
9193
run: |
9294
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
@@ -96,18 +98,21 @@ jobs:
9698
DIR: src/code.cloudfoundry.org/gorouter
9799
DB: mysql
98100
run: |
101+
"${GITHUB_WORKSPACE}"/ci/routing-release/helpers/configure-binaries.bash
99102
"${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
100103
- name: cf-tcp-router-mysql
101104
env:
102105
DIR: src/code.cloudfoundry.org/cf-tcp-router
103106
DB: mysql
104107
run: |
108+
"${GITHUB_WORKSPACE}"/ci/routing-release/helpers/configure-binaries.bash
105109
"${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
106110
- name: routing-api-mysql
107111
env:
108112
DIR: src/code.cloudfoundry.org/routing-api
109113
DB: mysql
110114
run: |
115+
"${GITHUB_WORKSPACE}"/ci/routing-release/helpers/configure-binaries.bash
111116
"${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
112117
test-repos-withoutdb:
113118
runs-on: ubuntu-latest
@@ -122,7 +127,9 @@ jobs:
122127
uses: actions/download-artifact@v4
123128
with:
124129
name: repo
125-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
130+
- run: |
131+
tar -xzvf repo-artifact.tar.gz
132+
tar -xzvf ci-artifact.tar.gz
126133
- name: build binaries
127134
run: |
128135
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
@@ -158,7 +165,9 @@ jobs:
158165
uses: actions/download-artifact@v4
159166
with:
160167
name: repo
161-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
168+
- run: |
169+
tar -xzvf repo-artifact.tar.gz
170+
tar -xzvf ci-artifact.tar.gz
162171
- name: build binaries
163172
run: |
164173
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
@@ -194,7 +203,9 @@ jobs:
194203
uses: actions/download-artifact@v4
195204
with:
196205
name: repo
197-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
206+
- run: |
207+
tar -xzvf repo-artifact.tar.gz
208+
tar -xzvf ci-artifact.tar.gz
198209
- name: build binaries
199210
run: |
200211
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"

0 commit comments

Comments
 (0)