Rename CI base image app-broker-ci

spikymonkey · spikymonkey · commit 6abaacdd6765 · 2021-05-12T17:45:48.000+01:00
Disambiguate and decouple from other users
diff --git a/ci/images/app-broker-ci/Dockerfile b/ci/images/app-broker-ci/Dockerfile
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -16,13 +16,13 @@ aliases:
       text: <!here> Build <${ATC_EXTERNAL_URL}/builds/$BUILD_ID|$BUILD_NAME> of job $BUILD_JOB_NAME in the $BUILD_PIPELINE_NAME pipeline has failed!
 
 jobs:
-  - name: build-release-ci-images
+  - name: build-ci-images
     plan:
       - get: ci-images-git-repo
         trigger: true
-      - put: release-ci-image
+      - put: app-broker-ci-image
         params:
-          build: ci-images-git-repo/ci/images/release-ci-image
+          build: ci-images-git-repo/ci/images/app-broker-ci
         get_params:
           skip_download: "true"
 
@@ -36,7 +36,7 @@ jobs:
         timeout: 1h30m
         file: git-repo/ci/tasks/build-project.yml
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params: &artifactory-params
           repo: libs-snapshot-local
@@ -65,7 +65,7 @@ jobs:
       - task: acceptance-tests
         file: git-repo/ci/tasks/acceptance-tests.yml
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
     on_success:
       in_parallel:
         - *slack-success-notification
@@ -87,7 +87,7 @@ jobs:
         file: git-repo/ci/tasks/stage.yml
         vars:
           release-type: M
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params:
           <<: *artifactory-params
@@ -106,7 +106,7 @@ jobs:
         file: git-repo/ci/tasks/stage.yml
         vars:
           release-type: RC
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params:
           <<: *artifactory-params
@@ -125,7 +125,7 @@ jobs:
         file: git-repo/ci/tasks/stage.yml
         vars:
           release-type: RELEASE
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
       - put: artifactory-repo
         params:
           <<: *artifactory-params
@@ -148,7 +148,7 @@ jobs:
         file: git-repo/ci/tasks/promote.yml
         vars:
           release-type: M
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: promote-rc
     serial: true
@@ -165,7 +165,7 @@ jobs:
         file: git-repo/ci/tasks/promote.yml
         vars:
           release-type: RC
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: promote-release
     serial: true
@@ -182,7 +182,7 @@ jobs:
         file: git-repo/ci/tasks/promote.yml
         vars:
           release-type: RELEASE
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: distribute-release
     serial: true
@@ -198,7 +198,7 @@ jobs:
       - task: distribute
         file: git-repo/ci/tasks/distribute.yml
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
           bintray-distribution-repo: ((bintray-distribution-repo))
           bintray-package: ((bintray-package))
           bintray-repo: ((bintray-repo))
@@ -218,7 +218,7 @@ jobs:
       - task: sync-to-maven-central
         file: git-repo/ci/tasks/sync-to-maven-central.yml
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
           bintray-package: ((bintray-package))
           bintray-repo: ((bintray-repo))
           bintray-subject: ((bintray-subject))
@@ -267,13 +267,13 @@ resources:
       branch: ((branch))
       paths: ["ci/images/*"]
 
-  - name: release-ci-image
+  - name: app-broker-ci-image
     type: docker-image
     source:
-      repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
+      repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
       username: ((corporate-harbor-robot-account.username))
       password: ((corporate-harbor-robot-account.password))
-      tag: ((release-image-tag))
+      tag: ((ci-image-tag))
 
   - name: artifactory-repo
     type: artifactory-resource
@@ -317,4 +317,4 @@ groups:
       - sync-to-maven-central
   - name: "ci-images"
     jobs:
-      - build-release-ci-images
+      - build-ci-images
diff --git a/ci/pr-pipeline.yml b/ci/pr-pipeline.yml
@@ -27,7 +27,7 @@ jobs:
         input_mapping:
           git-repo: pull-request
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
 
   - name: run-acceptance-tests
     serial: true
@@ -45,7 +45,7 @@ jobs:
         input_mapping:
           git-repo: pull-request
         vars:
-          release-image-tag: ((release-image-tag))
+          ci-image-tag: ((ci-image-tag))
     on_success:
       in_parallel:
       - *slack-success-notification
diff --git a/ci/tasks/acceptance-tests.yml b/ci/tasks/acceptance-tests.yml
@@ -3,8 +3,8 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
-    tag: ((release-image-tag))
+    repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+    tag: ((ci-image-tag))
 inputs:
   - name: git-repo
   - name: toolsmith-env
diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml
@@ -3,8 +3,8 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
-    tag: ((release-image-tag))
+    repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+    tag: ((ci-image-tag))
 inputs:
   - name: git-repo
 outputs:
diff --git a/ci/tasks/distribute.yml b/ci/tasks/distribute.yml
@@ -3,8 +3,8 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
-    tag: ((release-image-tag))
+    repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+    tag: ((ci-image-tag))
 inputs:
   - name: git-repo
   - name: artifactory-repo
diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml
@@ -3,8 +3,8 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
-    tag: ((release-image-tag))
+    repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+    tag: ((ci-image-tag))
 inputs:
   - name: git-repo
   - name: artifactory-repo
diff --git a/ci/tasks/stage.yml b/ci/tasks/stage.yml
@@ -3,8 +3,8 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
-    tag: ((release-image-tag))
+    repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+    tag: ((ci-image-tag))
 inputs:
   - name: git-repo
 outputs:
diff --git a/ci/tasks/sync-to-maven-central.yml b/ci/tasks/sync-to-maven-central.yml
@@ -3,8 +3,8 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/release-ci-image
-    tag: ((release-image-tag))
+    repository: ((corporate-harbor-registry))/((dockerhub-organization))/app-broker-ci
+    tag: ((ci-image-tag))
 inputs:
   - name: git-repo
   - name: artifactory-repo
diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh
@@ -3,19 +3,19 @@
 set -euo pipefail
 
 set_pipeline() {
-	local pipeline_name pipeline_definition branch release_image_tag
+	local pipeline_name pipeline_definition branch ci_image_tag
 	pipeline_name="${1:?pipeline name must be provided}"
 	pipeline_definition="${2:?pipeline definition file must be provided}"
 	branch="${3:?branch must be provided}"
-	release_image_tag="${4:-$branch}"
+	ci_image_tag="${4:-$branch}"
 
 	echo "Setting $pipeline_name pipeline..."
 	fly --target app-broker set-pipeline \
 		--pipeline "$pipeline_name" \
 		--config "$pipeline_definition" \
 		--load-vars-from config-concourse.yml \
 		--var "branch=$branch" \
-		--var "release-image-tag=$release_image_tag"
+		--var "ci-image-tag=$ci_image_tag"
 }
 
 main() {
