Finalizing tests (2)

rnpgp · Sep 21, 2023 · 843b0af · 843b0af
1 parent ee65bdd
commit 843b0af
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/.github/workflows/centos-and-fedora-new.yml b/.github/workflows/centos-and-fedora-new.yml
@@ -222,7 +222,7 @@ jobs:
       - name: Upload SRPM
         uses: actions/upload-artifact@v3
         with:
-          name: 'SRPM ${{ matrix.env.name }}'
+          name: 'SRPM ${{ matrix.image.name }}'
           path: 'build/SRPM/*.src.rpm'
           retention-days: 5
 
@@ -256,7 +256,7 @@ jobs:
       - name: Download SRPM
         uses: actions/download-artifact@v3
         with:
-          name: 'SRPM ${{ matrix.env.name }}'
+          name: 'SRPM ${{ matrix.image.name }}'
           path: ~/rpmbuild/SRPMS
 
       - name: Extract SRPM
@@ -276,7 +276,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
-          name: 'RPM ${{ matrix.env.name}}'
+          name: 'RPM ${{ matrix.image.name}}'
           path: '~/rpmbuild/SOURCES/RPMS/*.rpm'
           retention-days: 5
 
@@ -287,18 +287,18 @@ jobs:
   rpm-tests:
     runs-on: ubuntu-latest
     needs: package
-    container: ${{ matrix.env.container }}
+    container: ${{ matrix.image.container }}
     timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
-        env:
+        image:
           - { name: 'CentOS 7',  container: 'centos:7'                      }
           - { name: 'CentOS 8',  container: 'tgagor/centos:stream8'         }
           - { name: 'CentOS 9',  container: 'quay.io/centos/centos:stream9' }
           - { name: 'Fedora 35', container: 'fedora:35'                     }
           - { name: 'Fedora 36', container: 'fedora:36'                     }
-    name: RPM test on ${{ matrix.env.name }}
+    name: RPM test on ${{ matrix.image.name }}
 
     steps:
       - name: Install prerequisites
@@ -310,26 +310,26 @@ jobs:
 #   ribose repo is also a source of json-c (v12 aka json-c12) for CentOS 7
 
       - name: Install ribose-packages
-        if: matrix.env.container == 'centos:7' || matrix.env.container == 'tgagor/centos:stream8'
+        if: matrix.image.container == 'centos:7' || matrix.image.container == 'tgagor/centos:stream8'
         run: |
            sudo rpm --import https://github.com/riboseinc/yum/raw/master/ribose-packages-next.pub
            sudo wget https://github.com/riboseinc/yum/raw/master/ribose.repo -O /etc/yum.repos.d/ribose.repo
 
       - name: Install epel-release
-        if: matrix.env.container == 'quay.io/centos/centos:stream9'
+        if: matrix.image.container == 'quay.io/centos/centos:stream9'
         run: |
            sudo dnf -y install 'dnf-command(config-manager)'
            sudo dnf config-manager --set-enabled crb
            sudo dnf -y install epel-release
 
       - name: Install xargs
-        if: matrix.env.container == 'fedora:35'
+        if: matrix.image.container == 'fedora:35'
         run:  sudo yum -y install findutils
 
       - name: Download rnp rpms
         uses: actions/download-artifact@v3
         with:
-          name: 'RPM ${{ matrix.env.name}}'
+          name: 'RPM ${{ matrix.image.name}}'
 
       - name: Checkout shell test framework
         uses: actions/checkout@v3
@@ -369,11 +369,11 @@ jobs:
 # Ribose repo provides json-c12-devel for CentOS7;
 # el8, el9, fr35, fr36 provide json-c-devel (version 12+)
       - name: Setup json-c12
-        if: matrix.env.container == 'centos:7'
+        if: matrix.image.container == 'centos:7'
         run: sudo yum -y install json-c12-devel
 
       - name: Setup json-c
-        if: matrix.env.container != 'centos:7'
+        if: matrix.image.container != 'centos:7'
         run: sudo yum -y install json-c-devel
 
       - name: Run packaging tests