From 72dbd8380ea2469a4f5dbce16320d75ffe3214ba Mon Sep 17 00:00:00 2001
From: Stefan Hauth <stefan.hauth@dynatrace.com>
Date: Fri, 24 Jan 2025 00:55:32 +0100
Subject: [PATCH] Re-add ppc64le, s390x. Run CI and Release workflow on
 Ubuntu-22.04

---
 .github/workflows/ci.yaml      | 28 ++++++++++++++--------------
 .github/workflows/release.yaml | 18 +++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cb594da76f..0bf0ae31f9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,7 +19,7 @@ env:
 jobs:
   helm-test:
     name: Run helm unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -34,7 +34,7 @@ jobs:
 
   helm-lint:
     name: Run helm linting
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -49,7 +49,7 @@ jobs:
 
   tests:
     name: Run unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -82,7 +82,7 @@ jobs:
 
   linting:
     name: Run linting
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -106,7 +106,7 @@ jobs:
 
   generated-files:
     name: Check generated files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -121,7 +121,7 @@ jobs:
 
   security:
     name: Code security scanning alerts
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -134,7 +134,7 @@ jobs:
 
   markdown-lint:
     name: Lint markdown files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -147,7 +147,7 @@ jobs:
 
   check-uncommitted-doc-changes:
     name: Check uncommitted changes in api docs action
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -166,7 +166,7 @@ jobs:
 
   prepare:
     name: Prepare properties
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -200,11 +200,11 @@ jobs:
 
   build:
     name: Build images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [prepare, tests, linting, generated-files]
     strategy:
       matrix:
-        platform: [amd64, arm64]
+        platform: [amd64, arm64, ppc64le, s390x]
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -218,11 +218,11 @@ jobs:
 
   push:
     name: Push images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [prepare, build]
     strategy:
       matrix:
-        platform: [amd64, arm64]
+        platform: [amd64, arm64, ppc64le, s390x]
     if: ${{ !github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
@@ -246,7 +246,7 @@ jobs:
   manifest:
     name: Create manifest
     needs: [prepare, push]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       COMBINED: ${{ github.ref_protected }}
     if: ${{ !github.event.pull_request.head.repo.fork }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3038039e0e..dac444ec60 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
       contents: read
       id-token: write
     name: Prepare properties
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -36,11 +36,11 @@ jobs:
 
   build:
     name: Build images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [prepare]
     strategy:
       matrix:
-        platform: [amd64, arm64]
+        platform: [amd64, arm64, ppc64le, s390x]
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -55,12 +55,12 @@ jobs:
     name: Push images
     environment: Release
     needs: [prepare, build]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       id-token: write
     strategy:
       matrix:
-        platform: [amd64, arm64]
+        platform: [amd64, arm64, ppc64le, s390x]
         registry: [gcr, dockerhub, amazon-ecr, rhcc]
         include:
         - registry: gcr
@@ -122,7 +122,7 @@ jobs:
     name: Create Docker manifests
     environment: Release
     needs: [prepare, push]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       id-token: write
     outputs:
@@ -189,7 +189,7 @@ jobs:
     name: Attach sbom
     environment: Release
     needs: [ prepare, push, manifest ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       id-token: write
     strategy:
@@ -250,7 +250,7 @@ jobs:
     name: Run preflight for rhcc
     environment: Release
     needs: [ prepare, push, manifest]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       SCAN_REGISTRY: "quay.io"
     steps:
@@ -280,7 +280,7 @@ jobs:
       contents: write
       pull-requests: write
       id-token: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2