From b8658398083455592280ec663419567eac9aeb88 Mon Sep 17 00:00:00 2001
From: Pauli <pauli@openssl.org>
Date: Thu, 30 Mar 2023 09:13:48 +1100
Subject: [PATCH] fixup! Add action to cross validate FIPS providers

---
 .github/workflows/provider-compatibility.yml | 59 ++------------------
 1 file changed, 4 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/provider-compatibility.yml b/.github/workflows/provider-compatibility.yml
index cd06b0a49ce843..898037bd424a00 100644
--- a/.github/workflows/provider-compatibility.yml
+++ b/.github/workflows/provider-compatibility.yml
@@ -10,16 +10,15 @@
 
 name: Provider compatibility across versions
 
-on: #[pull_request]
-  schedule:
-    - cron: '0 15 * * *'
+on: [pull_request]
+#  schedule:
+#    - cron: '0 15 * * *'
 
 permissions:
   contents: read
 
 env:
   opts: enable-rc5 enable-md2 enable-ssl3 enable-weak-ssl-ciphers enable-zlib
-  tests: openssl-3.0.0:-test_ct.-test_ssl_new
 
 jobs:
   fips-releases:
@@ -86,30 +85,6 @@ jobs:
                                                  -providers
         working-directory: ${{ matrix.release.dir }}
 
-      - name: limit tests
-        run: |
-          opt=""
-          for tp in $tests;                                                 \
-          do                                                                \
-            ver=`echo $tp | cut -f1 -d:`;                                   \
-            if [ "$ver" = ${{ matrix.release.dir }} ];                      \
-            then                                                            \
-              opt="$opt `echo $tp | cut -f2 -d: | tr . ' '`";               \
-            fi;                                                             \
-          done
-          if [ -n "$opt" ];                                                 \
-          then                                                              \
-            echo TESTS="$opt" >> $GITHUB_ENV;                               \
-          fi
-
-      - name: show limited tests
-        run: echo TESTS=@$TESTS@
-
-      - name: make test
-        run: |
-          make test HARNESS_JOBS=${HARNESS_JOBS:-4}
-        working-directory: ${{ matrix.release.dir }}
-
       - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.release.tgz }}
@@ -203,8 +178,7 @@ jobs:
         # not possible to modify the tarball to avoid problematic test cases.
         tree_a: [ branch-master, branch-3.1, branch-3.0,
                   openssl-3.0.0, openssl-3.0.8, openssl-3.1.0 ]
-        tree_b: [ branch-master, branch-3.1, branch-3.0,
-                  openssl-3.0.8, openssl-3.1.0 ]
+        tree_b: [ branch-master, branch-3.1, branch-3.0  ]
     steps:
       - name: early exit checks
         id: early_exit
@@ -214,12 +188,6 @@ jobs:
             echo "Skipping because both are the same version";              \
             exit 1;                                                         \
           fi
-          if [ "`echo ${{ matrix.tree_a }} | cut -f1 -d-`" = 'openssl' -a   \
-               "`echo ${{ matrix.tree_b }} | cut -f1 -d-`" = 'openssl' ];   \
-          then                                                              \
-            echo "Skipping because both are released versions";             \
-            exit 1;                                                         \
-          fi
         continue-on-error: true
 
       - uses: actions/download-artifact@v3
@@ -256,25 +224,6 @@ jobs:
                                                  -providers
         working-directory: ${{ matrix.tree_b }}
 
-      - name: limit tests
-        if: steps.early_exit.outcome == 'success'
-        run: |
-          # installing across versions is against policy
-          opt="-test_fipsinstall"
-          for tp in $tests;                                                 \
-          do                                                                \
-            ver=`echo $tp | cut -f1 -d:`;                                   \
-            if [ "$ver" = ${{ matrix.tree_b }} ];                           \
-            then                                                            \
-              opt="$opt `echo $tp | cut -f2 -d: | tr . ' '`";               \
-            fi;                                                             \
-          done
-          echo TESTS="$opt" >> $GITHUB_ENV
-
-      - name: show limited tests
-        if: steps.early_exit.outcome == 'success'
-        run: echo TESTS=@$TESTS@
-
       - name: run cross validation tests of FIPS from A with tree from B
         if: steps.early_exit.outcome == 'success'
         run: |