testing for new tar

ciq-rocky-fips · Nov 18, 2024 · 943e351 · 943e351
1 parent 53e8334
commit 943e351
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/.github/workflows/fipsmodule.yml b/.github/workflows/fipsmodule.yml
@@ -38,22 +38,25 @@ jobs:
           ls -l ./RESULTS
 
           # Extract the FIPS module
-          mkdir RESULTS/{tmp,fips_module}
-          cd RESULTS/tmp
-          if [ -z "$DEBUG" ]; then
-              echo "Extracting FIPS module"
-              rpm2cpio ../openssl-libs-3*ciqfips*.x86_64.rpm | cpio -idmv ./usr/lib64/\*/fips.so
-          else
-              mkdir -p usr/lib64/ossl-modules
-              echo Creating fake fips module
-              touch usr/lib64/ossl-modules/fips.so
-          fi
-          mv ./usr/lib64/ossl-modules/fips.so ../fips_module/fips.so.x86_64
+          #mkdir RESULTS/{tmp,fips_module}
+          #cd RESULTS/tmp
+          #if [ -z "$DEBUG" ]; then
+          #    echo "Extracting FIPS module"
+          #    rpm2cpio ../openssl-libs-3*ciqfips*.x86_64.rpm | cpio -idmv ./usr/lib64/\*/fips.so
+          #else
+          #    mkdir -p usr/lib64/ossl-modules
+          #    echo Creating fake fips module
+          #    touch usr/lib64/ossl-modules/fips.so
+          #fi
+          #mv ./usr/lib64/ossl-modules/fips.so ../fips_module/fips.so.x86_64
           cd ..
           RPMVERSION=$(ls ./openssl-libs-3*ciqfips*.x86_64.rpm | sed -e 's/.*openssl-libs-\(3.*\)\.x86_64\.rpm/\1/')
-          echo "Creating fips module tarball"
-          tar -czf fips_module-${RPMVERSION}.tar.gz fips_module
-          sha256sum fips_module-${RPMVERSION}.tar.gz > fips_module-${RPMVERSION}.tar.gz.sha256
+          echo "Creating fips provider tarball"
+          #tar -czf fips_module-${RPMVERSION}.tar.gz fips_module
+          #sha256sum fips_module-${RPMVERSION}.tar.gz > fips_module-${RPMVERSION}.tar.gz.sha256
+
+          tar -czf fips_provider-${RPMVERSION}.tar.gz *.rpm
+          sha256sum fips_provider-${RPMVERSION}.tar.gz > fips_provider-${RPMVERSION}.tar.gz.sha256
 
       - uses: actions/upload-artifact@v4
         with:
@@ -63,7 +66,7 @@ jobs:
             RESULTS/*.rpm
       - uses: actions/upload-artifact@v4
         with:
-          name: fips_module_tarball
+          name: fips_tarball
           path: |
             RESULTS/*.tar.gz
             RESULTS/*.tar.gz.sha256