Skip to content

Commit 3e0abdf

Browse files
spikymonkeyroyclarkson
authored andcommitted
Migrate to new image repositories
1 parent b1f3f07 commit 3e0abdf

13 files changed

+124
-50
lines changed

ci/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#App Broker CI Pipeline
1+
# App Broker CI Pipeline
22

33
## Running the acceptance tests on Cloud Foundry locally
44

@@ -36,7 +36,7 @@ The original pipeline was decomposed into different jobs so that we could recove
3636

3737
### Fly
3838

39-
The pipeline can be run using the following script:
39+
The pipeline can be set using the following script on the most recent branch of the repository:
4040

4141
```$bash
4242
$ ./scripts/set-pipelines.sh
@@ -49,22 +49,22 @@ If you don't want to click, you can trigger each job using the CLI:
4949
To release a milestone:
5050

5151
```$bash
52-
$ fly -t scs trigger-job -j release-test/stage-milestone
53-
$ fly -t scs trigger-job -j release-test/promote-milestone
52+
$ fly -t app-broker trigger-job -j release-test/stage-milestone
53+
$ fly -t app-broker trigger-job -j release-test/promote-milestone
5454
```
5555

5656
To release an RC:
5757

5858
```$bash
59-
$ fly -t scs trigger-job -j release-test/stage-rc
60-
$ fly -t scs trigger-job -j release-test/promote-rc
59+
$ fly -t app-broker trigger-job -j release-test/stage-rc
60+
$ fly -t app-broker trigger-job -j release-test/promote-rc
6161
```
6262

6363
To release a GA:
6464

6565
```$bash
66-
$ fly -t scs trigger-job -j release-test/stage-release
67-
$ fly -t scs trigger-job -j release-test/promote-release
68-
$ fly -t scs trigger-job -j release-test/distribute-release
69-
$ fly -t scs trigger-job -j release-test/sync-to-maven-central
66+
$ fly -t app-broker trigger-job -j release-test/stage-release
67+
$ fly -t app-broker trigger-job -j release-test/promote-release
68+
$ fly -t app-broker trigger-job -j release-test/distribute-release
69+
$ fly -t app-broker trigger-job -j release-test/sync-to-maven-central
7070
```

ci/pipeline.yml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,26 @@ jobs:
2222
trigger: true
2323
- get: ci-images-git-repo
2424
trigger: true
25+
- task: generate-docker-credentials
26+
file: ci-images-git-repo/ci/tasks/generate-docker-credentials.yml
27+
input_mapping:
28+
git-repo: ci-images-git-repo
29+
vars:
30+
registry: ((app-broker-dev-docker-registry))
31+
registry-username: ((broadcom-jfrog-artifactory-robot-account.username))
32+
registry-password: ((broadcom-jfrog-artifactory-robot-account.password))
2533
- task: build-image
2634
privileged: true
27-
config:
28-
platform: linux
29-
image_resource:
30-
type: registry-image
31-
source:
32-
repository: ((dockerhub-mirror-registry))/concourse/oci-build-task
33-
tag: 0.10.0
34-
inputs:
35-
- name: source
36-
outputs:
37-
- name: image
38-
run:
39-
path: build
35+
file: ci-images-git-repo/ci/tasks/build-oci-image.yml
4036
input_mapping:
41-
source: ci-images-git-repo
37+
git-repo: ci-images-git-repo
4238
params:
43-
CONTEXT: source/ci/images/app-broker-ci
39+
CONTEXT: git-repo/ci/images/app-broker-ci
4440
- put: app-broker-ci-image
4541
inputs: detect
4642
params:
4743
image: image/image.tar
48-
get_params:
49-
skip_download: true
44+
no_get: true
5045
on_failure: *slack-failure-notification
5146

5247
- name: build
@@ -231,13 +226,17 @@ resource_types:
231226
- name: artifactory-resource
232227
type: registry-image
233228
source:
234-
repository: ((dockerhub-mirror-registry))/springio/artifactory-resource
229+
repository: ((app-broker-virtual-docker-registry))/springio/artifactory-resource
230+
username: ((broadcom-jfrog-artifactory-robot-account.username))
231+
password: ((broadcom-jfrog-artifactory-robot-account.password))
235232
tag: 0.0.14
236233

237234
- name: slack-notification
238235
type: registry-image
239236
source:
240-
repository: ((dockerhub-mirror-registry))/cfcommunity/slack-notification-resource
237+
repository: ((app-broker-virtual-docker-registry))/cfcommunity/slack-notification-resource
238+
username: ((broadcom-jfrog-artifactory-robot-account.username))
239+
password: ((broadcom-jfrog-artifactory-robot-account.password))
241240
tag: latest
242241

243242
- name: shepherd
@@ -296,14 +295,18 @@ resources:
296295
source:
297296
uri: ((github-repo))
298297
branch: ((branch))
299-
paths: ["ci/images/*"]
298+
paths:
299+
- ci/images/*
300+
- ci/scripts/generate-docker-credentials.sh
301+
- ci/tasks/build-oci-image.yml
302+
- ci/tasks/generate-docker-credentials.yml
300303

301304
- name: app-broker-ci-image
302305
type: registry-image
303306
source:
304-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
305-
username: ((corporate-harbor-robot-account.username))
306-
password: ((corporate-harbor-robot-account.password))
307+
repository: ((app-broker-dev-docker-registry))/ci/app-broker-ci
308+
username: ((broadcom-jfrog-artifactory-robot-account.username))
309+
password: ((broadcom-jfrog-artifactory-robot-account.password))
307310
tag: ((ci-image-tag))
308311

309312
- name: artifactory-repo

ci/pr-manager-pipeline.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ resource_types:
3939
- name: pull-request
4040
type: registry-image
4141
source:
42-
repository: ((dockerhub-mirror-registry))/teliaoss/github-pr-resource
42+
repository: ((app-broker-virtual-docker-registry))/teliaoss/github-pr-resource
43+
username: ((broadcom-jfrog-artifactory-robot-account.username))
44+
password: ((broadcom-jfrog-artifactory-robot-account.password))
4345
tag: v0.23.0
4446

4547
resources:

ci/pr-pipeline.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ resource_types:
6363
- name: pull-request
6464
type: registry-image
6565
source:
66-
repository: ((dockerhub-mirror-registry))/teliaoss/github-pr-resource
66+
repository: ((app-broker-virtual-docker-registry))/teliaoss/github-pr-resource
67+
username: ((broadcom-jfrog-artifactory-robot-account.username))
68+
password: ((broadcom-jfrog-artifactory-robot-account.password))
6769
tag: latest
6870

6971
- name: slack-notification
7072
type: registry-image
7173
source:
72-
repository: ((dockerhub-mirror-registry))/cfcommunity/slack-notification-resource
74+
repository: ((app-broker-virtual-docker-registry))/cfcommunity/slack-notification-resource
75+
username: ((broadcom-jfrog-artifactory-robot-account.username))
76+
password: ((broadcom-jfrog-artifactory-robot-account.password))
7377
tag: latest
7478

7579
- name: shepherd
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
set -eu
4+
5+
export TERM="xterm-256color"
6+
7+
readonly DOCKER_CONFIG_OUTPUT="${DOCKER_CONFIG_OUTPUT:?must be set}"
8+
9+
# Note that we don't use libs.sh here because that script requires bash, and
10+
# we don't have bash in this container image
11+
12+
printf "%s" "$REGISTRY_PASSWORD" | docker login "$REGISTRY" --username "$REGISTRY_USERNAME" --password-stdin
13+
cp -v ~/.docker/config.json "$DOCKER_CONFIG_OUTPUT/"

ci/tasks/acceptance-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7-
username: ((corporate-harbor-robot-account.username))
8-
password: ((corporate-harbor-robot-account.password))
6+
repository: ((app-broker-dev-docker-registry))/ci/app-broker-ci
7+
username: ((broadcom-jfrog-artifactory-robot-account.username))
8+
password: ((broadcom-jfrog-artifactory-robot-account.password))
99
tag: ((ci-image-tag))
1010
inputs:
1111
- name: git-repo

ci/tasks/build-oci-image.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
platform: linux
2+
3+
image_resource:
4+
type: registry-image
5+
source:
6+
repository: ((app-broker-virtual-docker-registry))/concourse/oci-build-task
7+
tag: 0.11.1
8+
username: ((broadcom-jfrog-artifactory-robot-account.username))
9+
password: ((broadcom-jfrog-artifactory-robot-account.password))
10+
11+
inputs:
12+
- name: git-repo
13+
- name: docker-config
14+
15+
outputs:
16+
- name: image
17+
18+
run:
19+
path: build
20+
21+
params:
22+
DEBUG: true
23+
DOCKER_CONFIG: docker-config

ci/tasks/build-project.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7-
username: ((corporate-harbor-robot-account.username))
8-
password: ((corporate-harbor-robot-account.password))
6+
repository: ((app-broker-dev-docker-registry))/ci/app-broker-ci
7+
username: ((broadcom-jfrog-artifactory-robot-account.username))
8+
password: ((broadcom-jfrog-artifactory-robot-account.password))
99
tag: ((ci-image-tag))
1010
inputs:
1111
- name: git-repo
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
platform: linux
2+
3+
image_resource:
4+
type: registry-image
5+
source:
6+
repository: ((app-broker-virtual-docker-registry))/docker
7+
tag: 26-cli
8+
username: ((broadcom-jfrog-artifactory-robot-account.username))
9+
password: ((broadcom-jfrog-artifactory-robot-account.password))
10+
11+
inputs:
12+
- name: git-repo
13+
14+
outputs:
15+
- name: docker-config
16+
17+
run:
18+
path: ci/scripts/generate-docker-credentials.sh
19+
dir: git-repo
20+
21+
params:
22+
DOCKER_CONFIG_OUTPUT: ../docker-config
23+
REGISTRY: ((registry))
24+
REGISTRY_USERNAME: ((registry-username))
25+
REGISTRY_PASSWORD: ((registry-password))

ci/tasks/list-prs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
6+
repository: ((app-broker-dev-docker-registry))/ci/app-broker-ci
7+
username: ((broadcom-jfrog-artifactory-robot-account.username))
8+
password: ((broadcom-jfrog-artifactory-robot-account.password))
79
tag: ((ci-image-tag))
8-
username: ((corporate-harbor-robot-account.username))
9-
password: ((corporate-harbor-robot-account.password))
1010

1111
inputs:
1212
- name: git-repo

ci/tasks/promote.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
6+
repository: ((app-broker-virtual-docker-registry))/springio/concourse-release-scripts
7+
username: ((broadcom-jfrog-artifactory-robot-account.username))
8+
password: ((broadcom-jfrog-artifactory-robot-account.password))
79
tag: '0.3.4'
810
inputs:
911
- name: git-repo

ci/tasks/stage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
7-
username: ((corporate-harbor-robot-account.username))
8-
password: ((corporate-harbor-robot-account.password))
6+
repository: ((app-broker-dev-docker-registry))/ci/app-broker-ci
7+
username: ((broadcom-jfrog-artifactory-robot-account.username))
8+
password: ((broadcom-jfrog-artifactory-robot-account.password))
99
tag: ((ci-image-tag))
1010
inputs:
1111
- name: git-repo

ci/tasks/sync-to-maven-central.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ platform: linux
33
image_resource:
44
type: registry-image
55
source:
6-
repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
6+
repository: ((app-broker-virtual-docker-registry))/springio/concourse-release-scripts
7+
username: ((broadcom-jfrog-artifactory-robot-account.username))
8+
password: ((broadcom-jfrog-artifactory-robot-account.password))
79
tag: '0.3.4'
810
inputs:
911
- name: git-repo

0 commit comments

Comments
 (0)