Attempt to fix broken jobs

OFS · Dec 19, 2022 · 50b4252 · 50b4252
1 parent 10a4fd3
commit 50b4252
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-rpms.yml b/.github/workflows/build-rpms.yml
@@ -22,13 +22,13 @@ jobs:
         run: docker build . -f docker/${{ matrix.distro }}/Dockerfile -t opae-${{ matrix.distro }}
       - name: Build RPMs
         run: |
-          docker run --rm -v ${{ github.workspace }}:/opae-sdk opae-${{ matrix.distro }} /opae-sdk
+          docker run --rm -v ${{ github.workspace }}:/opae-${{ matrix.distro }}/opae-sdk opae-${{ matrix.distro }} /opae-${{ matrix.distro }}/opae-sdk
       - name: Install and Test RPMs
-        if: ${{ github.event_name != 'pull_request'}}
+        #if: ${{ github.event_name != 'pull_request'}}
         run: |
-          docker run --rm -v ${{ github.workspace }}/${{ matrix.distro }}:/build --entrypoint /bin/bash  opae-${{ matrix.distro }} -c "/scripts/test-rpms.sh /build"
+          docker run --rm -v ${{ github.workspace }}:/opae-${{ matrix.distro }}/opae-sdk --entrypoint /bin/bash /scripts/test-rpms.sh /opae-${{ matrix.distro }}/opae-sdk/packaging/opae/rpm
       - name: Upload Artifact
-        if: ${{ github.event_name != 'pull_request'}}
+        #if: ${{ github.event_name != 'pull_request'}}
         uses: actions/upload-artifact@v2.1.4
         with:
           name: OPAE-${{ matrix.distro }}

diff --git a/scripts/test-rpms.sh b/scripts/test-rpms.sh
@@ -1,11 +1,12 @@
-#! /bin/bash
-#
+#!/bin/bash
 rpmdir=$(realpath ${1:-$PWD})
-yum install -y $rpmdir/opae*.rpm
-if [ $? == 1 ]; then
+
+dnf install -y $rpmdir/opae*.rpm
+if [ $? -ne 0 ]; then
 	echo "Could not install OPAE RPMs"
 	exit 1
 fi
+
 failures=0
 test_exit_code(){
 	expected_code=$1