Skip to content

Commit 6f2f3a7

Browse files
committed
Use Ubuntu for tss2 and sssd until they pass CI
1 parent 72a8c90 commit 6f2f3a7

File tree

2 files changed

+13
-67
lines changed

2 files changed

+13
-67
lines changed

.github/workflows/libtss2.yml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,8 @@ concurrency:
99
cancel-in-progress: true
1010

1111
jobs:
12-
build_wolfprovider:
13-
uses: ./.github/workflows/build-wolfprovider.yml
14-
with:
15-
wolfssl_ref: ${{ matrix.wolfssl_ref }}
16-
openssl_ref: ${{ matrix.openssl_ref }}
17-
replace_default: ${{ matrix.replace_default }}
18-
strategy:
19-
matrix:
20-
wolfssl_ref: [ 'v5.8.2-stable' ]
21-
openssl_ref: [ 'openssl-3.5.2' ]
22-
replace_default: [ true ]
23-
2412
test_tpm2_tss:
2513
runs-on: ubuntu-22.04
26-
container:
27-
image: debian:bookworm
28-
env:
29-
DEBIAN_FRONTEND: noninteractive
30-
needs: build_wolfprovider
3114
timeout-minutes: 30
3215
strategy:
3316
matrix:
@@ -43,8 +26,8 @@ jobs:
4326
steps:
4427
- name: Install test dependencies
4528
run: |
46-
apt-get update
47-
apt-get install -y pkg-config libcunit1-dev autoconf-archive \
29+
sudo apt-get update
30+
sudo apt-get install -y pkg-config libcunit1-dev autoconf-archive \
4831
gettext libcmocka-dev build-essential autoconf automake libtool \
4932
libjson-c-dev libcurl4-openssl-dev acl libusb-1.0-0-dev git \
5033
pkg-config uuid-dev
@@ -54,34 +37,9 @@ jobs:
5437
with:
5538
fetch-depth: 1
5639

57-
- name: Checking OpenSSL/wolfProvider packages in cache
58-
uses: actions/cache/restore@v4
59-
id: wolfprov-cache
60-
with:
61-
path: |
62-
${{ env.WOLFSSL_PACKAGES_PATH }}
63-
${{ env.OPENSSL_PACKAGES_PATH }}
64-
${{ env.WOLFPROV_PACKAGES_PATH }}
65-
key: openssl-wolfprov-debian-packages-${{ github.sha }}${{ matrix.replace_default && '-replace-default' || '' }}
66-
fail-on-cache-miss: true
67-
68-
- name: Install wolfSSL/OpenSSL/wolfprov packages
40+
- name: Build wolfProvider
6941
run: |
70-
printf "Installing OpenSSL/wolfProvider packages:\n"
71-
ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
72-
ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
73-
ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
74-
75-
apt install --reinstall -y \
76-
${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
77-
78-
apt install --reinstall -y \
79-
${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
80-
${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
81-
${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
82-
83-
apt install --reinstall -y \
84-
${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
42+
OPENSSL_TAG=${{ matrix.openssl_ref }} WOLFSSL_TAG=${{ matrix.wolfssl_ref }} ./scripts/build-wolfprovider.sh
8543
8644
- name: Checkout tpm2-tss
8745
uses: actions/checkout@v4
@@ -102,6 +60,7 @@ jobs:
10260
- name: Build and install tpm2-tss
10361
working-directory: tpm2_tss_repo
10462
run: |
63+
source $GITHUB_WORKSPACE/scripts/env-setup.sh
10564
./bootstrap
10665
./configure --prefix=$PWD/tpm2-tss-install --with-crypto=ossl \
10766
--enable-unit
@@ -111,6 +70,7 @@ jobs:
11170
- name: Run tpm2-tss tests
11271
working-directory: tpm2_tss_repo
11372
run: |
73+
source $GITHUB_WORKSPACE/scripts/env-setup.sh
11474
export ${{ matrix.force_fail }}
11575
make check 2>&1 || true
11676
if $(grep -q "FAIL: test/unit" test-suite.log); then

.github/workflows/sssd.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
sssd_ref: [ 'master', '2.9.1' ]
27-
wolfssl_ref: [ 'v5.8.2-stable' ]
28-
openssl_ref: [ 'openssl-3.5.2' ]
27+
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
28+
openssl_ref: [ 'openssl-3.5.0' ]
2929
force_fail: ['WOLFPROV_FORCE_FAIL=1', '']
3030
exclude:
3131
- sssd_ref: 'master'
@@ -36,25 +36,7 @@ jobs:
3636
with:
3737
fetch-depth: 1
3838

39-
# Check if this version of wolfssl/wolfprovider has already been built,
40-
# mark to cache these items on post if we do end up building
41-
- name: Checking wolfSSL/wolfProvider in cache
42-
uses: actions/cache@v4
43-
id: wolfprov-cache
44-
with:
45-
path: |
46-
wolfssl-install
47-
wolfprov-install
48-
openssl-install/lib64
49-
openssl-install/include
50-
openssl-install/bin
51-
52-
key: wolfprov-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}-${{ github.sha }}
53-
lookup-only: true
54-
55-
# If not yet built this version, build it now
5639
- name: Build wolfProvider
57-
if: steps.wolfprov-cache.outputs.cache-hit != 'true'
5840
run: |
5941
OPENSSL_TAG=${{ matrix.openssl_ref }} WOLFSSL_TAG=${{ matrix.wolfssl_ref }} ./scripts/build-wolfprovider.sh
6042
@@ -101,10 +83,14 @@ jobs:
10183
working-directory: sssd
10284
shell: bash
10385
run: |
86+
# Set environment variables
87+
export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/wolfssl-install/lib:$GITHUB_WORKSPACE/openssl-install/lib64
88+
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
89+
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
10490
export ${{ matrix.force_fail }}
10591
10692
echo "Checking OpenSSL providers:"
107-
openssl list -providers | tee provider-list.log
93+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
10894
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
10995
11096
# If force fail is enabled dont exit with error

0 commit comments

Comments
 (0)