ci(coordinator): Align coordinator CI image build with the router's matrixed, cached pattern

Signed-off-by: Revital Sur <eres@il.ibm.com>

Author: revit13

.github/workflows/ci-coordinator.yaml

@@ -1,7 +1,9 @@
 name: CI - Coordinator Test
 
 # Runs coordinator unit tests and e2e tests. Path filter excludes paths not
-# exercised by the coordinator.
+# exercised by the coordinator. The e2e-images matrix job is followed by an
+# e2e-images-status job that aggregates its result, since GitHub required
+# status checks cannot reference individual matrix legs.
 on:
   push:
     branches:
@@ -40,6 +42,7 @@ jobs:
               - scripts/**
               - hack/**
               - test/**
+              - .github/actions/docker-build-and-push/action.yml
               - .github/actions/e2e-runner-setup/action.yml
               - .github/workflows/ci-coordinator.yaml
               - '!Dockerfile.sidecar'
@@ -85,10 +88,85 @@ jobs:
           GO_BUILD_CACHE_VOL: ${{ steps.go-cache.outputs.build }}
         run: make -f Makefile.coord.mk test-unit
 
-  e2e-tests:
+  e2e-images:
     needs: check-changes
     if: ${{ needs.check-changes.outputs.src == 'true' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - name: builder
+            source: build
+            docker-file: Dockerfile.builder
+            image-name: llm-d-builder
+            archive: llm-d-builder
+          - name: coordinator
+            source: build
+            docker-file: Dockerfile.coordinator
+            image-name: llm-d-coordinator
+            archive: llm-d-coordinator
+          - name: epp
+            source: build
+            docker-file: Dockerfile.epp
+            image-name: llm-d-router-endpoint-picker
+            archive: llm-d-router-endpoint-picker
+          - name: simulator
+            source: pull
+            image: ghcr.io/llm-d/llm-d-inference-sim:v0.10.2
+            archive: llm-d-inference-sim
+    name: e2e-images (${{ matrix.image.name }})
+    steps:
+      - name: Checkout source
+        if: ${{ matrix.image.source == 'build' }}
+        uses: actions/checkout@v7
+
+      - name: Build ${{ matrix.image.name }} image
+        if: ${{ matrix.image.source == 'build' }}
+        uses: ./.github/actions/docker-build-and-push
+        with:
+          docker-file: ${{ matrix.image.docker-file }}
+          image-name: ${{ matrix.image.image-name }}
+          tag: dev
+          registry: ghcr.io/llm-d
+          push: 'false'
+          buildx-outputs: type=docker,dest=${{ runner.temp }}/${{ matrix.image.archive }}.tar
+          commit-sha: ${{ github.sha }}
+
+      - name: Pull ${{ matrix.image.name }} image
+        if: ${{ matrix.image.source == 'pull' }}
+        run: |
+          docker pull --platform linux/amd64 "${{ matrix.image.image }}"
+          docker save "${{ matrix.image.image }}" -o "${{ runner.temp }}/${{ matrix.image.archive }}.tar"
+
+      - name: Upload ${{ matrix.image.name }} image
+        uses: actions/upload-artifact@v7
+        with:
+          name: e2e-coord-image-${{ matrix.image.name }}
+          path: ${{ runner.temp }}/${{ matrix.image.archive }}.tar
+          retention-days: 1
+          compression-level: 0
+
+  e2e-images-status:
+    needs: e2e-images
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check e2e-images result
+        run: |
+          result="${{ needs.e2e-images.result }}"
+          if [[ "$result" != "success" && "$result" != "skipped" ]]; then
+            echo "::error::e2e-images failed for at least one matrix image"
+            exit 1
+          fi
+
+  e2e-tests:
+    needs:
+      - check-changes
+      - e2e-images
+    if: ${{ needs.check-changes.outputs.src == 'true' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
       - name: Checkout source
@@ -98,9 +176,40 @@ jobs:
         id: e2e-setup
         uses: ./.github/actions/e2e-runner-setup
 
+      - name: Download builder image
+        uses: actions/download-artifact@v8
+        with:
+          name: e2e-coord-image-builder
+          path: ${{ runner.temp }}/e2e-images
+
+      - name: Download coordinator image
+        uses: actions/download-artifact@v8
+        with:
+          name: e2e-coord-image-coordinator
+          path: ${{ runner.temp }}/e2e-images
+
+      - name: Download EPP image
+        uses: actions/download-artifact@v8
+        with:
+          name: e2e-coord-image-epp
+          path: ${{ runner.temp }}/e2e-images
+
+      - name: Download simulator image
+        uses: actions/download-artifact@v8
+        with:
+          name: e2e-coord-image-simulator
+          path: ${{ runner.temp }}/e2e-images
+
+      - name: Load e2e images
+        shell: bash
+        run: |
+          for image in "${RUNNER_TEMP}"/e2e-images/*.tar; do
+            docker load --input "$image"
+          done
+
       - name: Run coordinator e2e tests
         shell: bash
         env:
           GO_MOD_CACHE_VOL: ${{ steps.e2e-setup.outputs.go-mod-cache }}
           GO_BUILD_CACHE_VOL: ${{ steps.e2e-setup.outputs.go-build-cache }}
-        run: make -f Makefile.coord.mk test-e2e-coordinator
+        run: make -f Makefile.coord.mk test-e2e-coordinator-run

Makefile.coord.mk

@@ -4,7 +4,7 @@ SHELL := /usr/bin/env bash
 TARGETOS ?= $(shell command -v go >/dev/null 2>&1 && go env GOOS || uname -s | tr '[:upper:]' '[:lower:]')
 TARGETARCH ?= $(shell command -v go >/dev/null 2>&1 && go env GOARCH || uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/; s/armv7l/arm/')
 PROJECT_NAME ?= llm-d-coordinator
-BUILDER_IMAGE_NAME ?= llm-d-coordinator-builder
+BUILDER_IMAGE_NAME ?= llm-d-builder
 IMAGE_REGISTRY ?= ghcr.io/llm-d
 
 # Image tags