ci: additional fixes

redhat-plumbers · Jul 4, 2024 · dced311 · dced311
1 parent c8a1c69
commit dced311
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -18,17 +18,17 @@ permissions:
     contents: read
 
 jobs:
-    arm64:
+    push_to_registry:
         name: ${{ matrix.config.tag }} on ${{ matrix.config.platform }}
         runs-on: ubuntu-latest
         concurrency:
-            group: arm64-${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
+            group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.config.dockerfile }}
             cancel-in-progress: true
         strategy:
             fail-fast: false
             matrix:
                 config:
-                    - { dockerfile: 'Dockerfile-Fedora-latest',     tag: 'fedora',     platform: 'linux/arm64,linux/amd64' }
+                    - { dockerfile: 'Dockerfile-CentOS-10-Stream',   tag: 'centos:stream10' }
         steps:
             -   name: Set up QEMU
                 uses: docker/setup-qemu-action@v3

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -18,7 +18,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 test: [
                         "01",
@@ -42,7 +42,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 network: [
                         "network",
@@ -72,7 +72,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "opensuse",
+                        "centos:stream10",
                 ]
                 network: [
                         "network-legacy",
@@ -129,7 +129,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 test: [
                         "02",
@@ -168,7 +168,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 network: [
                         "network-manager",
@@ -205,7 +205,7 @@ jobs:
         strategy:
             matrix:
                 container: [
-                        "fedora",
+                        "centos:stream10",
                 ]
                 test: [
                         "98",

diff --git a/.github/workflows/manualtest.yml b/.github/workflows/manualtest.yml
@@ -9,9 +9,9 @@ on:
             container:
                 type: choice
                 description: 'distro'
-                default: 'fedora'
+                default: 'centos:stream10'
                 options:
-                    - "fedora"
+                    - "centos:stream10"
             env:
                 description: 'Environment (optional)'
                 default: '{"DEBUGFAIL": "rd.debug"}'