ci: normalize base image consumption

* extract yaml anchors to make future updates easier

Signed-off-by: Aram Price <[email protected]>

Author: KauzClay

ci/dockerfiles/docker-cpi/Dockerfile

@@ -1,6 +1,6 @@
 # this image builds bosh/docker-cpi
 # it is used across ci to start a bosh in a docker container
-ARG BASE_IMAGE=bosh/integration:main
+ARG BASE_IMAGE
 FROM $BASE_IMAGE
 
 RUN docker_gpg="/etc/apt/trusted.gpg.d/docker.gpg" \

ci/dockerfiles/integration/Dockerfile

@@ -1,5 +1,5 @@
 # ghcr.io/cloudfoundry/bosh/integration:main
-ARG BASE_IMAGE=ubuntu:jammy
+ARG BASE_IMAGE
 FROM $BASE_IMAGE
 
 ARG BOSH_CLI_URL

ci/dockerfiles/main-mysql/Dockerfile

@@ -1,5 +1,5 @@
-ARG BRANCH
-FROM bosh/integration:${BRANCH}
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
 
 # Install Dependencies
 RUN echo 'mysql-server mysql-server/root_password password password' | debconf-set-selections

ci/dockerfiles/main-postgres/Dockerfile

@@ -1,5 +1,5 @@
-ARG BRANCH
-FROM bosh/integration:${BRANCH}
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
 
 ARG DB_VERSION
 

ci/dockerfiles/warden-cpi/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ghcr.io/cloudfoundry/bosh/integration:main
+ARG BASE_IMAGE
 FROM $BASE_IMAGE
 
 RUN apt-get update -y \

ci/pipeline.yml

@@ -1116,7 +1116,7 @@ jobs:
       params:
         bump: patch
 
-  - name: build-integration
+  - name: build-integration-jammy
     public: true
     serial: true
     plan:
@@ -1147,12 +1147,14 @@ jobs:
       params:
         build: .
         build_args_file: docker-build-args/docker-build-args.json
+        build_args:
+          BASE_IMAGE: *ubuntu_base_jammy
         dockerfile: bosh-ci-dockerfiles/ci/dockerfiles/integration/Dockerfile
         tag_as_latest: true
       get_params:
         skip_download: true
 
-  - name: build-integration-noble
+  - name: build-integration
     public: true
     serial: true
     plan:
@@ -1198,7 +1200,7 @@ jobs:
           build: "bosh-ci-dockerfiles/ci/dockerfiles/main-postgres"
           build_args:
             DB_VERSION: "13"
-            BRANCH: ((branch_name))
+            BASE_IMAGE: *integration_image
         get_params:
           skip_download: true
 
@@ -1216,7 +1218,7 @@ jobs:
           build: "bosh-ci-dockerfiles/ci/dockerfiles/main-postgres"
           build_args:
             DB_VERSION: "15"
-            BRANCH: ((branch_name))
+            BASE_IMAGE: *integration_image
         get_params:
           skip_download: true
 
@@ -1233,7 +1235,7 @@ jobs:
           tag_as_latest: true
           build: "bosh-ci-dockerfiles/ci/dockerfiles/main-mysql"
           build_args:
-            BRANCH: ((branch_name))
+            BASE_IMAGE: *integration_image
         get_params:
           skip_download: true
 
@@ -1258,7 +1260,7 @@ jobs:
         build: docker-build-context
         build_args:
           BASE_IMAGE: *integration_image
-        tag_as_latest: false
+        tag_as_latest: true
       get_params:
         skip_download: true
 
@@ -1284,7 +1286,7 @@ jobs:
         build: docker-build-context
         build_args:
           BASE_IMAGE: *integration_image_jammy
-        tag_as_latest: true
+        tag_as_latest: false
       get_params:
         skip_download: true
 
@@ -1335,7 +1337,7 @@ jobs:
         build: docker-build-context
         build_args:
           BASE_IMAGE: *integration_image_jammy
-        tag_as_latest: true
+        tag_as_latest: false
       get_params:
         skip_download: true