Skip to content

Commit 9b67e91

Browse files
spikymonkeyroyclarkson
spikymonkey
authored and
royclarkson
committed
Migrate to new image repositories
1 parent d6505e3 commit 9b67e91

File tree

10 files changed

+89
-24
lines changed

10 files changed

+89
-24
lines changed

‎ci/README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ 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 from the `main` branch:
39+
The pipeline can be set using the following script on the most recent branch of the repository:
4040

4141
```$bash
42-
$ ./ci/scripts/set-pipeline.sh
42+
$ ./scripts/set-pipelines.sh
4343
```
4444

4545
### Release commands
@@ -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/scripts/generate-docker-credentials.sh‎

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

‎ci/tasks/generate-docker-credentials.yml‎

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)