From 6aa4b4ab0a62c8b9ba10221a7d91ed3479f72bbb Mon Sep 17 00:00:00 2001
From: Guy Owen <guy.owen@dpc.vic.gov.au>
Date: Fri, 19 Jan 2024 15:57:43 +1100
Subject: [PATCH] [DDS-1845] Revert to step for awx-ee context creation.

---
 .github/workflows/build-deploy.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index 89756037..b38de5b1 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -13,22 +13,7 @@ on:
 env:
   REGISTRY: ghcr.io
 jobs:
-  awx-ee-context:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./images/awx-ee
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Create the AWX-EE build instruction file
-        run: |
-          pip install --upgrade ansible-builder
-          ansible-builder create \
-            --output-filename Dockerfile \
-            --verbosity 3
   buildx:
-    needs: awx-ee-context
     if: github.event.pull_request.merged == true || contains(fromJson('["schedule", "workflow_dispatch"]'), github.event_name) || github.event_name == 'pull_request' && startsWith(github.head_ref,'build/')
     runs-on: ubuntu-latest
     strategy:
@@ -43,9 +28,6 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Troubleshoot awx-ee context
-        run: ls -al ./images/awx-ee
-
       - name: Login to registry ${{ env.REGISTRY }}
         uses: docker/login-action@v2.2.0
         with:
@@ -71,6 +53,15 @@ jobs:
             org.opencontainers.image.title=${{ matrix.images }}
             org.opencontainers.image.description=${{ matrix.images }} image for Bay container platform
 
+      - name: Create the AWX-EE context
+        if: matrix.images == 'awx-ee'
+        run: |
+          pip install --upgrade ansible-builder
+          ansible-builder create \
+            --output-filename Dockerfile \
+            --verbosity 3
+        working-directory: ./images/awx-ee
+
       - name: Build and push the images
         uses: docker/bake-action@v3.1.0
         with: