Skip to content

Commit 746981a

Browse files
kart2bckart2bc
committed
add gcp registry to pull image
1 parent abb4742 commit 746981a

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎.github/gh-config-template/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generate github actions from template
22

3-
ytt -f ./gh_template.yml -f [ytt-helpers.star](https://github.com/cloudfoundry/wg-app-platform-runtime-ci/blob/main/shared/helpers/ytt-helpers.star) -f [index.yml](https://github.com/kart2bc/wg-app-platform-runtime-ci/blob/main/routing-release/index.yml) > ./workflows/tests-workflow.yml
3+
ytt -f ./gh_template.yml -f [ytt-helpers.star](https://github.com/cloudfoundry/wg-app-platform-runtime-ci/blob/main/shared/helpers/ytt-helpers.star) -f [index.yml](https://github.com/cloudfoundry/wg-app-platform-runtime-ci/blob/main/routing-release/index.yml) > ./workflows/tests-workflow.yml
44

55
## Supported jobs
66
- Template tests

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

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

66
on:
77
push:
8-
branches: [ "github-action" ]
8+
branches:
9+
- develop
910
pull_request:
10-
branches: [ "github-action" ]
1111

1212
env:
1313
MAPPING: |
@@ -39,7 +39,7 @@ jobs:
3939
- name: routing-release-repo
4040
uses: actions/checkout@v4
4141
with:
42-
repository: kart2bc/routing-release.git
42+
repository: cloudfoundry/routing-release.git
4343
ref: github-action
4444
submodules: recursive
4545
path: repo
@@ -50,7 +50,6 @@ jobs:
5050
path: ci
5151
- name: zip repo artifacts
5252
run: |
53-
ls -l
5453
tar -czf repo-artifact.tar.gz repo
5554
tar -czf ci-artifact.tar.gz ci
5655
- name: upload artifact
@@ -70,7 +69,7 @@ jobs:
7069
uses: actions/download-artifact@v4
7170
with:
7271
name: repo
73-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\nls -lR ${GITHUB_WORKSPACE}/ci/routing-release/helpers/ \n"
72+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
7473
- name: template-tests
7574
run: |
7675
"${GITHUB_WORKSPACE}"/ci/shared/tasks/run-tests-templates/task.bash
@@ -86,11 +85,9 @@ jobs:
8685
name: repo
8786
- run: |
8887
tar -xzvf repo-artifact.tar.gz
89-
tar -xzvf ci-artifact.tar.gz
90-
ls -l
88+
tar -xzvf ci-artifact.tar.gz
9189
- name: build binaries
9290
run: |
93-
ls -lR
9491
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
9592
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
9693
#@ for package in helpers.packages_with_configure_db(data.values.internal_repos):
@@ -115,10 +112,8 @@ jobs:
115112
- run: |
116113
tar -xzvf repo-artifact.tar.gz
117114
tar -xzvf ci-artifact.tar.gz
118-
ls -l
119115
- name: build binaries
120116
run: |
121-
ls -lR
122117
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
123118
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
124119
#@ for package in helpers.packages_without_configure_db(data.values.internal_repos):
@@ -142,10 +137,8 @@ jobs:
142137
- run: |
143138
tar -xzvf repo-artifact.tar.gz
144139
tar -xzvf ci-artifact.tar.gz
145-
ls -l
146140
- name: build binaries
147141
run: |
148-
ls -lR
149142
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
150143
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
151144
#@ for package in helpers.packages_with_configure_db(data.values.internal_repos):
@@ -169,10 +162,8 @@ jobs:
169162
- run: |
170163
tar -xzvf repo-artifact.tar.gz
171164
tar -xzvf ci-artifact.tar.gz
172-
ls -l
173165
- name: build binaries
174166
run: |
175-
ls -lR
176167
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
177168
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
178169
#@ for package in helpers.packages_with_configure_db(data.values.internal_repos):

‎.github/workflows/tests-workflow.yml‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ name: unit-integration-tests
22
on:
33
push:
44
branches:
5-
- github-action
5+
- develop
66
pull_request:
7-
branches:
8-
- github-action
7+
98
env:
109
MAPPING: |
1110
build_nats_server=src/code.cloudfoundry.org/vendor/github.com/nats-io/nats-server/v2
@@ -35,18 +34,17 @@ jobs:
3534
- name: routing-release-repo
3635
uses: actions/checkout@v4
3736
with:
38-
repository: kart2bc/routing-release.git
37+
repository: cloudfoundry/routing-release.git
3938
ref: develop
4039
submodules: recursive
4140
path: repo
4241
- name: Check out wg-appruntime code
4342
uses: actions/checkout@v4
4443
with:
45-
repository: kart2bc/wg-app-platform-runtime-ci
44+
repository: cloudfoundry/wg-app-platform-runtime-ci
4645
path: ci
4746
- name: zip repo artifacts
4847
run: |
49-
ls -l
5048
tar -czf repo-artifact.tar.gz repo
5149
tar -czf ci-artifact.tar.gz ci
5250
- name: upload artifact
@@ -60,30 +58,35 @@ jobs:
6058
runs-on: ubuntu-latest
6159
needs: repo-clone
6260
container:
63-
image: cloudfoundry/tas-runtime-mysql-5.7
61+
image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-build
62+
credentials:
63+
username: _json_key
64+
password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }}
6465
steps:
6566
- name: Download artifact
6667
uses: actions/download-artifact@v4
6768
with:
6869
name: repo
69-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\nls -lR ${GITHUB_WORKSPACE}/ci/routing-release/helpers/ \n"
70+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
7071
- name: template-tests
7172
run: |
7273
"${GITHUB_WORKSPACE}"/ci/shared/tasks/run-tests-templates/task.bash
7374
test-on-mysql-5-7:
7475
runs-on: ubuntu-latest
7576
needs: repo-clone
7677
container:
77-
image: cloudfoundry/tas-runtime-mysql-5.7
78+
image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-mysql-5.7
79+
credentials:
80+
username: _json_key
81+
password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }}
7882
steps:
7983
- name: Download artifact
8084
uses: actions/download-artifact@v4
8185
with:
8286
name: repo
83-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\nls -lR ${GITHUB_WORKSPACE}/ci/routing-release/helpers/ \n"
87+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
8488
- name: build binaries
8589
run: |
86-
ls -lR
8790
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
8891
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
8992
- name: gorouter-mysql
@@ -108,16 +111,18 @@ jobs:
108111
runs-on: ubuntu-latest
109112
needs: repo-clone
110113
container:
111-
image: cloudfoundry/tas-runtime-build
114+
image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-build
115+
credentials:
116+
username: _json_key
117+
password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }}
112118
steps:
113119
- name: Download artifact
114120
uses: actions/download-artifact@v4
115121
with:
116122
name: repo
117-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\nls -l \n"
123+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
118124
- name: build binaries
119125
run: |
120-
ls -lR
121126
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
122127
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
123128
- name: multierror
@@ -142,16 +147,18 @@ jobs:
142147
runs-on: ubuntu-latest
143148
needs: repo-clone
144149
container:
145-
image: cloudfoundry/tas-runtime-postgres
150+
image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-postgres
151+
credentials:
152+
username: _json_key
153+
password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }}
146154
steps:
147155
- name: Download artifact
148156
uses: actions/download-artifact@v4
149157
with:
150158
name: repo
151-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\nls -l \n"
159+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
152160
- name: build binaries
153161
run: |
154-
ls -lR
155162
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
156163
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
157164
- name: gorouter-mysql
@@ -176,16 +183,18 @@ jobs:
176183
runs-on: ubuntu-latest
177184
needs: repo-clone
178185
container:
179-
image: cloudfoundry/tas-runtime-mysql-8.0
186+
image: us-central1-docker.pkg.dev/cf-diego-pivotal/tas-runtime-dockerhub-mirror/cloudfoundry/tas-runtime-mysql-8.0
187+
credentials:
188+
username: _json_key
189+
password: ${{ secrets.GCP_SERVICE_ACCOUNT_TAS_RUNTIME_BUILD_IMAGE_READER }}
180190
steps:
181191
- name: Download artifact
182192
uses: actions/download-artifact@v4
183193
with:
184194
name: repo
185-
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\nls -l \n"
195+
- run: "tar -xzvf repo-artifact.tar.gz\ntar -xzvf ci-artifact.tar.gz\n"
186196
- name: build binaries
187197
run: |
188-
ls -lR
189198
export DEFAULT_PARAMS="${GITHUB_WORKSPACE}/ci/routing-release/default-params/build-binaries/linux.yml"
190199
"${GITHUB_WORKSPACE}"/ci/shared/tasks/build-binaries/task.bash
191200
- name: gorouter-mysql

0 commit comments

Comments
 (0)