Skip to content

Commit 086adab

Browse files
padelsbachpadelsbach
committed
Update remaining workflows
1 parent 979bbeb commit 086adab

37 files changed

+229
-106
lines changed

‎.github/workflows/bind9.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_bind:
2930
runs-on: ubuntu-22.04
@@ -42,6 +43,7 @@ jobs:
4243
openssl_ref: [ 'openssl-3.5.2' ]
4344
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4445
replace_default: [ true ]
46+
fips: [ false ]
4547
env:
4648
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4749
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -81,6 +83,10 @@ jobs:
8183
apt install --reinstall -y \
8284
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8385
86+
- name: Verify wolfProvider is properly installed
87+
run: |
88+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
89+
8490
- name: Install bind9 test dependencies
8591
run: |
8692
apt-get update
@@ -113,8 +119,6 @@ jobs:
113119
working-directory: bind9
114120
shell: bash
115121
run: |
116-
# Verify wolfProvider is properly installed
117-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
118122
119123
set +o pipefail # ignore errors from make check
120124
autoreconf -ivf

‎.github/workflows/cjose.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ jobs:
9090
apt install --reinstall -y \
9191
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
9292
93+
- name: Verify wolfProvider is properly installed
94+
run: |
95+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
96+
9397
- name: Download cjose
9498
uses: actions/checkout@v4
9599
with:
@@ -109,8 +113,6 @@ jobs:
109113
- name: Run cjose tests
110114
working-directory: cjose
111115
run: |
112-
# Verify wolfProvider is properly installed
113-
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '-replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
114116
export ${{ matrix.force_fail }}
115117
116118
make test 2>&1 | tee cjose-test.log

‎.github/workflows/curl.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_curl:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
openssl_ref: [ 'openssl-3.5.2' ]
4243
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install dependencies
8490
run: |
8591
apt-get update
@@ -107,8 +113,6 @@ jobs:
107113
working-directory: curl
108114
shell: bash
109115
run: |
110-
# Verify wolfProvider is properly installed
111-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
112116
set +o pipefail # ignore errors from make check
113117
export ${{ matrix.force_fail }}
114118
export CURL_REF=${{ matrix.curl_ref }}

‎.github/workflows/debian-package.yml‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Debian Package Test
33
# START OF COMMON SECTION
44
on:
55
push:
6-
branches: [ '**' ] # 'master', 'main', 'release/**' ]
6+
branches: [ 'master', 'main', 'release/**' ]
77
pull_request:
88
branches: [ '*' ]
99

@@ -27,6 +27,9 @@ jobs:
2727
replace_default: [ true ]
2828

2929
libwolfprov-standalone:
30+
# Standalone mode is disabled until we re-enable support for it in the debian build.
31+
if: false
32+
3033
runs-on: ubuntu-22.04
3134
needs: build_wolfprovider
3235
# Run inside Debian Bookworm to match packaging environment
@@ -77,11 +80,9 @@ jobs:
7780
apt install --reinstall -y \
7881
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7982
80-
- name: Verify installation
83+
- name: Verify wolfProvider is properly installed
8184
run: |
82-
echo "Package Installation Verification:"
83-
dpkg -l | grep libwolfprov
84-
dpkg -L libwolfprov
85+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.fips && '--fips' || '' }}
8586
8687
- name: Test OpenSSL provider functionality
8788
run: |
@@ -184,6 +185,11 @@ jobs:
184185
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
185186
WOLFPROV_PACKAGES_PATH: /tmp/wolfprov-packages
186187
steps:
188+
- name: Checkout wolfProvider
189+
uses: actions/checkout@v4
190+
with:
191+
fetch-depth: 1
192+
187193
- name: Checking OpenSSL/wolfProvider packages in cache
188194
uses: actions/cache/restore@v4
189195
id: wolfprov-cache
@@ -239,29 +245,9 @@ jobs:
239245
echo "Installed packages after wolfprov:"
240246
dpkg -l | grep -E "(wolfprov|wolfssl|openssl|libssl)"
241247
242-
- name: Test OpenSSL providers after wolfprov installation
248+
- name: Verify wolfProvider is properly installed
243249
run: |
244-
echo "Testing OpenSSL providers after wolfprov installation..."
245-
echo "Expected: This should show wolfprov as an available provider"
246-
247-
# Test openssl list -providers
248-
if openssl list -providers; then
249-
echo "SUCCESS: openssl list -providers works after wolfprov installation"
250-
else
251-
echo "FAILURE: openssl list -providers failed after wolfprov installation"
252-
exit 1
253-
fi
254-
255-
echo "Provider list after wolfprov installation:"
256-
openssl list -providers
257-
258-
# Check if wolfprov provider is available
259-
if openssl list -providers | grep -i "wolfprov"; then
260-
echo "SUCCESS: wolfprov provider is available"
261-
else
262-
echo "WARNING: wolfprov provider not found in provider list"
263-
echo "This might be expected if the provider needs to be explicitly loaded"
264-
fi
250+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
265251
266252
- name: Verify wolfprov configuration
267253
run: |

‎.github/workflows/git-ssh-dr.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ jobs:
1515
uses: ./.github/workflows/build-wolfprovider.yml
1616
with:
1717
wolfssl_ref: ${{ matrix.wolfssl_ref }}
18-
openssl_ref: 'openssl-3.5.0'
19-
replace_default: true
18+
openssl_ref: ${{ matrix.openssl_ref }}
19+
replace_default: ${{ matrix.replace_default }}
2020
strategy:
2121
matrix:
22-
wolfssl_ref: ['master', 'v5.8.2-stable']
22+
wolfssl_ref: [ 'v5.8.2-stable' ]
23+
openssl_ref: [ 'openssl-3.5.2' ]
24+
replace_default: [ true ]
25+
fips: [ false ]
2326

2427
git-ssh-default-replace-test:
2528
runs-on: ubuntu-22.04
@@ -32,7 +35,10 @@ jobs:
3235
timeout-minutes: 20
3336
strategy:
3437
matrix:
35-
wolfssl_ref: [ 'master', 'v5.8.2-stable' ]
38+
wolfssl_ref: [ 'v5.8.2-stable' ]
39+
openssl_ref: [ 'openssl-3.5.2' ]
40+
replace_default: [ true ]
41+
fips: [ false ]
3642
key_type: [ 'rsa', 'ecdsa', 'ed25519', 'chacha20-poly1305' ]
3743
force_fail: [ 'WOLFPROV_FORCE_FAIL=1', '' ]
3844
iterations: [ 10 ] # Total of 50 runs
@@ -55,7 +61,7 @@ jobs:
5561
${{ env.WOLFSSL_PACKAGES_PATH }}
5662
${{ env.OPENSSL_PACKAGES_PATH }}
5763
${{ env.WOLFPROV_PACKAGES_PATH }}
58-
key: openssl-wolfprov-debian-packages-${{ github.sha }}-replace-default
64+
key: openssl-wolfprov-debian-packages-${{ github.sha }}${{ matrix.replace_default && '-replace-default' || '' }}
5965
fail-on-cache-miss: true
6066

6167
- name: Install wolfSSL/OpenSSL/wolfprov packages
@@ -76,6 +82,10 @@ jobs:
7682
apt install --reinstall -y \
7783
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
7884
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
7989
- name: Set up environment
8090
run: |
8191
export DEBIAN_FRONTEND=noninteractive
@@ -86,9 +96,6 @@ jobs:
8696
- name: Run git + replace default + ssh test
8797
shell: bash
8898
run: |
89-
# Verify wolfProvider is properly installed
90-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
91-
9299
echo "=== Running Git + replace default + ssh Test ==="
93100
echo "Using the local test script for consistent testing"
94101
# Run the test with the matrix parameters

‎.github/workflows/grpc.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_grpc:
2930
runs-on: ubuntu-22.04
@@ -48,6 +49,7 @@ jobs:
4849
wolfssl_ref: [ 'v5.8.2-stable' ]
4950
openssl_ref: [ 'openssl-3.5.2' ]
5051
replace_default: [ true ]
52+
fips: [ false ]
5153
env:
5254
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
5355
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -87,6 +89,10 @@ jobs:
8789
apt install --reinstall -y \
8890
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8991
92+
- name: Verify wolfProvider is properly installed
93+
run: |
94+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
95+
9096
- name: Install prerequisites
9197
run: |
9298
apt-get update
@@ -129,8 +135,6 @@ jobs:
129135
- name: Run grpc tests with wolfProvider
130136
working-directory: ./grpc
131137
run: |
132-
# Verify wolfProvider is properly installed
133-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
134138
135139
# Start the port server
136140
./tools/run_tests/start_port_server.py

‎.github/workflows/iperf.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_iperf:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
openssl_ref: [ 'openssl-3.5.2' ]
4243
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install dependencies
8490
run: |
8591
apt-get update
@@ -118,8 +124,6 @@ jobs:
118124
- name: Run tests
119125
working-directory: iperf
120126
run: |
121-
# Verify wolfProvider is properly installed
122-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
123127
export ${{ matrix.force_fail }}
124128
125129
# Test variables for iperf

‎.github/workflows/ipmitool.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_ipmitool:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
wolfssl_ref: [ 'v5.8.2-stable' ]
4243
openssl_ref: [ 'openssl-3.5.2' ]
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install dependencies
8490
run: |
8591
apt-get update
@@ -97,8 +103,6 @@ jobs:
97103
- name: Confirm built with OpenSSL and test with wolfProvider
98104
working-directory: ipmitool
99105
run: |
100-
# Verify wolfProvider is properly installed
101-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
102106
103107
# Verify ipmitool was built and linked correctly with OpenSSL
104108
ldd src/ipmitool | grep -E '(libssl|libcrypto)'

‎.github/workflows/krb5.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
wolfssl_ref: [ 'v5.8.2-stable' ]
2525
openssl_ref: [ 'openssl-3.5.2' ]
2626
replace_default: [ true ]
27+
fips: [ false ]
2728

2829
test_krb5:
2930
runs-on: ubuntu-22.04
@@ -41,6 +42,7 @@ jobs:
4142
openssl_ref: [ 'openssl-3.5.2' ]
4243
force_fail: [ 'WOLFPROV_FORCE_FAIL=1', '' ]
4344
replace_default: [ true ]
45+
fips: [ false ]
4446
env:
4547
WOLFSSL_PACKAGES_PATH: /tmp/wolfssl-packages
4648
OPENSSL_PACKAGES_PATH: /tmp/openssl-packages
@@ -80,6 +82,10 @@ jobs:
8082
apt install --reinstall -y \
8183
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
8284
85+
- name: Verify wolfProvider is properly installed
86+
run: |
87+
$GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
88+
8389
- name: Install KRB5 dependencies
8490
run: |
8591
apt-get update
@@ -112,8 +118,6 @@ jobs:
112118
working-directory: krb5
113119
shell: bash
114120
run: |
115-
# Verify wolfProvider is properly installed
116-
$GITHUB_WORKSPACE/scripts/verify-debian.sh
117121
118122
set +o pipefail # ignore errors from make check
119123
# Build KRB5

0 commit comments

Comments
 (0)