Update common build

Author: padelsbach

.github/scripts/pam-pkcs11-test.sh

@@ -1,17 +1,12 @@
 #!/bin/bash
 set -euo pipefail
+set -x
 
-echo "[*] Setting up environment..."
-SCRIPT_PATH="$(cd "$(dirname "$0")" && pwd)/$(basename "$0")"
-REPO_ROOT=$(git -C "$(dirname "$SCRIPT_PATH")" rev-parse --show-toplevel)
-source $REPO_ROOT/scripts/env-setup || true
-
-if [[ -z "${OPENSSL_MODULES:-}" ]]; then
-    echo "Environment not set up: OPENSSL_MODULES is not defined or empty"
-    exit 1
-elif [[ ! -d "$OPENSSL_MODULES" ]]; then
-    echo "Could not find wolfProvider at $OPENSSL_MODULES"
-    echo "Please build it first..."
+# Confirm wolfProvider is configured by running openssl list -providers
+if openssl list -providers | grep -q libwolfprov; then
+    echo "wolfProvider is configured"
+else
+    echo "wolfProvider is not configured"
     exit 1
 fi
 

.github/workflows/asan.yml

@@ -4,8 +4,8 @@ name: Asan Test
 on:
   push:
     branches: [ "*" ]
-  #pull_request:
-    #branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/bind9.yml

@@ -4,8 +4,8 @@ name: Bind9 Tests
 on:
   push:
     branches: [ 'master', 'main', 'release/**' ]
-  #pull_request:
-    #branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,52 +18,78 @@ jobs:
     with:
       wolfssl_ref: ${{ matrix.wolfssl_ref }}
       openssl_ref: ${{ matrix.openssl_ref }}
+      replace_default: ${{ matrix.replace_default }}
     strategy:
       matrix:
-        wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
-        openssl_ref: [ 'openssl-3.5.0' ]
+        wolfssl_ref: [ 'v5.8.2-stable' ]
+        openssl_ref: [ 'openssl-3.5.2' ]
+        replace_default: [ true ]
 
   test_bind:
     runs-on: ubuntu-22.04
+    container:
+      image: debian:bookworm
+      env:
+        DEBIAN_FRONTEND: noninteractive
     needs: build_wolfprovider
     # This should be a safe limit for the tests to run.
     timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
         bind_ref: [ 'v9.18.28' ]
-        wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
-        openssl_ref: [ 'openssl-3.5.0' ]
+        wolfssl_ref: [ 'v5.8.2-stable' ]
+        openssl_ref: [ 'openssl-3.5.2' ]
+        replace_default: [ true ]
         force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
+    env:
+      WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
+      OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
+      WOLFPROV_PACKAGES_PATH: /tmp/wolfprov-packages
     steps:
       - name: Checkout wolfProvider
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Retrieving wolfSSL/wolfProvider from cache
+      - name: Checking OpenSSL/wolfProvider packages in cache
         uses: actions/cache/restore@v4
         id: wolfprov-cache
         with:
           path: |
-            wolfssl-install
-            wolfprov-install
-            openssl-install/lib64
-            openssl-install/include
-            openssl-install/bin
-
-          key: wolfprov-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
+            ${{ env.WOLFSSL_PACKAGES_PATH }}
+            ${{ env.OPENSSL_PACKAGES_PATH }}
+            ${{ env.WOLFPROV_PACKAGES_PATH }}
+          key: openssl-wolfprov-debian-packages-${{ github.sha }}${{ matrix.replace_default && '-replace-default' || '' }}
           fail-on-cache-miss: true
 
+      - name: Install wolfSSL/OpenSSL/wolfprov packages
+        run: |
+          printf "Installing OpenSSL/wolfProvider packages:\n"
+          ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
+          ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
+          ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
+
+          apt install --reinstall -y \
+            ${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
+
+          apt install --reinstall -y \
+            ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
+            ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
+            ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
+
+          apt install --reinstall -y \
+            ${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
+
       - name: Install bind9 test dependencies
         run: |
-          export DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update
-          sudo apt install -y build-essential automake libtool gnutls-bin \
-          pkg-config make libidn2-dev libuv1-dev libnghttp2-dev libcap-dev \
-          libjemalloc-dev zlib1g-dev libxml2-dev libjson-c-dev libcmocka-dev \
-          python3-pytest python3-dnspython python3-hypothesis
-          sudo PERL_MM_USE_DEFAULT=1 cpan -i Net::DNS
+          apt-get update
+          apt install -y build-essential automake libtool gnutls-bin \
+            pkg-config make libidn2-dev libuv1-dev libnghttp2-dev libcap-dev \
+            libjemalloc-dev zlib1g-dev libxml2-dev libjson-c-dev libcmocka-dev \
+            python3-pytest python3-dnspython python3-hypothesis patch iproute2 \
+            net-tools
+          PERL_MM_USE_DEFAULT=1 cpan -i Net::DNS
 
       - name: Checkout bind9
         uses: actions/checkout@v4
@@ -85,15 +111,14 @@ jobs:
 
       - name: Build and test bind9 with wolfProvider
         working-directory: bind9
+        shell: bash
         run: |
-          # Set up the environment for wolfProvider
-          source $GITHUB_WORKSPACE/scripts/env-setup
-
+          set +o pipefail # ignore errors from make check
           autoreconf -ivf
           ./configure
           make clean
           make -j$(nproc)
-          sudo ./bin/tests/system/ifconfig.sh up
+          ./bin/tests/system/ifconfig.sh up
 
           export ${{ matrix.force_fail }}
           make -j$(nproc) check 2>&1 | tee bind9-test.log