From 9f6334f80eb08a10603eb7bbca0bda32ec39e8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20R=C3=B6hrich?= <moritz.rohrich@suse.com>
Date: Mon, 20 Nov 2023 13:39:26 +0100
Subject: [PATCH] nightly workflow: drop buildx, remove job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove remnants of GC job.
Drop buildx and just use straight docker as buildx has been giving
trouble with networking.

Signed-off-by: Moritz Röhrich <moritz.rohrich@suse.com>
---
 .github/workflows/nightly.yaml | 79 ++++++++++------------------------
 1 file changed, 23 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index d8269c6..2523c32 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -13,22 +13,6 @@ on:
   workflow_dispatch:   # Or manually - for testing
 
 jobs:
-  prune1:
-    runs-on: self-hosted
-    steps:
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Context
-        run: |
-          docker context create builder
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          endpoint: builder
-
   build-and-test:
     runs-on: self-hosted
     steps:
@@ -82,18 +66,6 @@ jobs:
           python3 -m pip install boto3==1.24.96
           python3 -m pip install -r s3tests/requirements.txt
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Context
-        run: |
-          docker context create builder
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          endpoint: builder
-
       - name: Quay Login
         uses: docker/login-action@v2
         with:
@@ -107,34 +79,29 @@ jobs:
           DATE="$(date +%Y-%m-%d)"
           echo "tag=nightly-${DATE}" >> $GITHUB_OUTPUT
 
-      - name: Build Unittest Container
-        uses: docker/build-push-action@v4
-        with:
-          load: true
-          build-args: |
-            CMAKE_BUILD_TYPE=Release
-            S3GW_VERSION=${{ steps.date.outputs.tag }}
-            NPROC=16
-          tags: |
-            s3gw-unittests
-          target: s3gw-unittests
-          file: s3gw/Dockerfile
-          context: s3gw
-
-      - name: Build Nightly Container
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          build-args: |
-            CMAKE_BUILD_TYPE=Release
-            S3GW_VERSION=${{ steps.date.outputs.tag }}
-            NPROC=16
-            QUAY_EXPIRATION=1w
-          tags: |
-            quay.io/s3gw/s3gw:${{ steps.date.outputs.tag }}
-            quay.io/s3gw/s3gw:nightly-latest
-          file: s3gw/Dockerfile
-          context: s3gw
+      - name: Build Unittests
+        run: |
+          docker build \
+            --build-arg CMAKE_BUILD_TYPE=Release \
+            --build-arg NPROC=16 \
+            --file s3gw/Dockerfile \
+            --tag s3gw-unittests \
+            --target s3gw-unittests \
+            s3gw
+
+      - name: Build s3gw Container Image
+        run: |
+          docker build \
+            --build-arg CMAKE_BUILD_TYPE=Release \
+            --build-arg NPROC=16 \
+            --build-arg S3GW_VERSION=${{ steps.date.outputs.tag }} \
+            --build-arg QUAY_EXPIRATION=1w \
+            --file s3gw/Dockerfile \
+            --tag quay.io/s3gw/s3gw:latest \
+            --tag quay.io/s3gw/s3gw:${{ steps.date.outputs.tag }} \
+            s3gw
+          docker push quay.io/s3gw/s3gw:nightly-latest
+          docker push quay.io/s3gw/s3gw:${{ steps.date.outputs.tag }}
 
       - name: Run Unittests
         run: |