From f205846cf992d1fa0e66aec3c67b5270a318a41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Mon, 9 Dec 2024 17:30:25 +0100
Subject: [PATCH 1/2] Switch base image to Fedora 41
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nikola Forró <nforro@redhat.com>
---
 .github/workflows/base-image-rebuild.yml        | 6 +++---
 containers/{Containerfile.c9s => Containerfile} | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename containers/{Containerfile.c9s => Containerfile} (56%)

diff --git a/.github/workflows/base-image-rebuild.yml b/.github/workflows/base-image-rebuild.yml
index 70092fe..2626932 100644
--- a/.github/workflows/base-image-rebuild.yml
+++ b/.github/workflows/base-image-rebuild.yml
@@ -8,7 +8,7 @@ on:
     branches:
       - main
     paths:
-      - containers/Containerfile.c9s
+      - containers/Containerfile
 
 jobs:
   build:
@@ -20,8 +20,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - containerfile: containers/Containerfile.c9s
-            tags: "c9s latest"
+          - containerfile: containers/Containerfile
+            tags: "fedora latest"
 
     steps:
       - uses: actions/checkout@v3
diff --git a/containers/Containerfile.c9s b/containers/Containerfile
similarity index 56%
rename from containers/Containerfile.c9s
rename to containers/Containerfile
index fdbe3bf..e6b7d44 100644
--- a/containers/Containerfile.c9s
+++ b/containers/Containerfile
@@ -1,15 +1,11 @@
 # Be aware that this image is used for all stages, so if a dependency is removed be sure that it is
 # not required in anywhere
 
-FROM quay.io/centos/centos:stream9
+FROM registry.fedoraproject.org/fedora:41
 
 ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \
     ANSIBLE_STDOUT_CALLBACK=debug
 
-RUN dnf -y install epel-release && \
-    crb enable && \
-    # TODO: revert this change after psql:15 works fine
-    dnf -y module enable postgresql:16 && \
-    dnf -y upgrade && \
+RUN dnf -y upgrade && \
     dnf -y install ansible python3-pip && \
     dnf clean all

From 50c9a08d2de6fac06784ed84e1ba90d65b9649d4 Mon Sep 17 00:00:00 2001
From: Matej Focko <mfocko@redhat.com>
Date: Mon, 9 Dec 2024 17:44:17 +0100
Subject: [PATCH 2/2] ci: parallelize building images for different archs

As it appears, there are some SSL/TLS issues appearing in the container
image builds for the `ppc64le` architecture which, in the end, results
in build and push failure for all architecture, therefore parallelize
those image builds (even if it costs GitHub some resources) to avoid
failing altogether.

Signed-off-by: Matej Focko <mfocko@redhat.com>
---
 .github/workflows/base-image-rebuild.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/base-image-rebuild.yml b/.github/workflows/base-image-rebuild.yml
index 2626932..5744eac 100644
--- a/.github/workflows/base-image-rebuild.yml
+++ b/.github/workflows/base-image-rebuild.yml
@@ -22,6 +22,13 @@ jobs:
         include:
           - containerfile: containers/Containerfile
             tags: "fedora latest"
+            archs: "amd64"
+          - containerfile: containers/Containerfile
+            tags: "fedora latest"
+            archs: "arm64"
+          - containerfile: containers/Containerfile
+            tags: "fedora latest"
+            archs: "ppc64le"
 
     steps:
       - uses: actions/checkout@v3
@@ -38,7 +45,7 @@ jobs:
           containerfiles: ${{ matrix.containerfile }}
           image: base
           tags: ${{ matrix.tags }}
-          archs: amd64, arm64, ppc64le
+          archs: ${{ matrix.archs }}
           # Uncomment once we stop using oc cluster up for tests
           #           oci: true