From 058b7e60a13511a400681be42155bdcea230ae97 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com> Date: Sat, 31 Jul 2021 22:01:02 +0200 Subject: [PATCH] Mark auth-swtpm test as XFAIL on Fedora/OpenSSL and Fedora/OpenSSL/clang Apparently, verifying that either 'tsstartup' or 'tpm2_startup' is available is *not* sufficient to make auth-swtpm tests work again. See error log at https://gitlab.com/openconnect/openconnect/-/issues/287#note_641338923 [Originally by DP. DL added Fedora/OpenSSL/clang as well] Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com> Signed-off-by: Daniel Lenski --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 907119be..85b78406 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,8 @@ ubsan/OpenSSL/Fedora: - CFLAGS="$UBCFLAGS" ./configure --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests - make -j4 # obsolete-server-crypto: OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) - - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto" -j4 check +# auth-swtpm: XFAIL until we understand the TPM error + - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto auth-swtpm" -j4 check tags: - shared - linux @@ -401,9 +402,9 @@ Fedora/OpenSSL: - mv /etc/ppp /etc/ppp.DISABLED # auth-nonascii: UTF-8 support is not available in distro's ocserv package # obsolete-server-crypto: OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) - - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto" -j4 check +# auth-swtpm: XFAIL until we understand the TPM error # ppp-over-tls-sync: https://gitlab.com/openconnect/openconnect/-/issues/287#note_641198529) - - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto ppp-over-tls-sync" -j4 check + - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto auth-swtpm ppp-over-tls-sync" -j4 check tags: - shared except: @@ -434,9 +435,9 @@ Fedora/OpenSSL/clang: # we don't want pppd to invoke any actual connection scripts - mv /etc/ppp /etc/ppp.DISABLED # obsolete-server-crypto: OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) - - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto" -j4 check +# auth-swtpm: XFAIL until we understand the TPM error # ppp-over-tls-sync: https://gitlab.com/openconnect/openconnect/-/issues/287#note_641198529) - - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto ppp-over-tls-sync" -j4 check + - make VERBOSE=1 XFAIL_TESTS="obsolete-server-crypto auth-swtpm ppp-over-tls-sync" -j4 check tags: - shared except: -- 2.50.1