From f42dd947d4704796f4180a93e69705e7386f544b Mon Sep 17 00:00:00 2001 From: Daniel Lenski Date: Mon, 8 Feb 2021 16:08:17 -0800 Subject: [PATCH] CI: re-enable PPP tests for CentOS7, Fedora, and Ubuntu Still to-do: 1) Get socat+pppd working in CentOS8 and CentOS6 CI 2) Figure out why PPP tests are so slow (added log retention for 1 week, even on success, in Ubuntu18.04/GnuTLS build) Signed-off-by: Daniel Lenski --- .gitlab-ci.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80c5f96e..69993c08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ CentOS7/GnuTLS: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS7_BUILD script: - ./autogen.sh - - ./configure --with-java CFLAGS=-g + - ./configure --with-java --enable-ppp-tests CFLAGS=-g - make -j4 # UTF-8 support is not available - make VERBOSE=1 XFAIL_TESTS="auth-nonascii" -j4 check @@ -31,7 +31,7 @@ CentOS7/OpenSSL: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS7_BUILD script: - ./autogen.sh - - ./configure --without-gnutls --with-openssl --with-java --without-openssl-version-check --enable-dtls-xfail --disable-dsa-tests CFLAGS=-g + - ./configure --without-gnutls --with-openssl --with-java --without-openssl-version-check --enable-dtls-xfail --disable-dsa-tests --enable-ppp-tests CFLAGS=-g - make -j4 # auth-nonascii: UTF-8 support is not available # dtls-psk: communication with ocserv fails for undetermined reasons marking as xfail until issue is identified @@ -233,10 +233,10 @@ asan/OpenSSL/Fedora: Fedora/GnuTLS: script: - ./autogen.sh - - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check CFLAGS=-g + - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check --enable-ppp-tests CFLAGS=-g - make tmp-distdir - cd openconnect-$(git describe --tags | sed s/^v//) - - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check CFLAGS=-g + - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check --enable-ppp-tests CFLAGS=-g - make -j4 # Disable rdrand to work around https://bugzilla.redhat.com/1831086 - make VERBOSE=1 OPENSSL_ia32cap=~0x4000000000000000 -j4 check @@ -254,10 +254,10 @@ Fedora/GnuTLS: Fedora/GnuTLS/clang: script: - ./autogen.sh - - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check CC=clang CFLAGS=-g + - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check CC=clang --enable-ppp-tests CFLAGS=-g - make tmp-distdir - cd openconnect-$(git describe --tags | sed s/^v//) - - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check CC=clang CFLAGS=-g + - ./configure --with-java --disable-dsa-tests --without-gnutls-version-check CC=clang --enable-ppp-tests CFLAGS=-g - make -j4 # Disable rdrand to work around https://bugzilla.redhat.com/1831086 - make VERBOSE=1 OPENSSL_ia32cap=~0x4000000000000000 -j4 check @@ -277,10 +277,10 @@ Fedora/OpenSSL: # Re-enable DSA since we test it - update-crypto-policies --set LEGACY - ./autogen.sh - - ./configure --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests CFLAGS=-g + - ./configure --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests --enable-ppp-tests CFLAGS=-g - make tmp-distdir - cd openconnect-$(git describe --tags | sed s/^v//) - - ./configure --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests CFLAGS=-g + - ./configure --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests --enable-ppp-tests CFLAGS=-g - make -j4 # 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 @@ -300,10 +300,10 @@ Fedora/OpenSSL/clang: # Re-enable DSA since we test it - update-crypto-policies --set LEGACY - ./autogen.sh - - ./configure CC=clang --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests CFLAGS=-g + - ./configure CC=clang --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests --enable-ppp-tests CFLAGS=-g - make tmp-distdir - cd openconnect-$(git describe --tags | sed s/^v//) - - ./configure CC=clang --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests CFLAGS=-g + - ./configure CC=clang --without-gnutls --with-openssl --without-openssl-version-check --disable-dsa-tests --enable-ppp-tests CFLAGS=-g - make -j4 # 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 @@ -322,7 +322,7 @@ Ubuntu18.04/GnuTLS: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$UBUNTU_BUILD script: - ./autogen.sh - - ./configure --with-java CFLAGS=-g + - ./configure --with-java --enable-ppp-tests CFLAGS=-g - make -j4 # UTF-8 support is not available - make VERBOSE=1 XFAIL_TESTS="auth-nonascii" -j4 check @@ -333,7 +333,6 @@ Ubuntu18.04/GnuTLS: - schedules artifacts: expire_in: 1 week - when: on_failure paths: - tests/*.log @@ -341,7 +340,7 @@ Ubuntu18.04/OpenSSL: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$UBUNTU_BUILD script: - ./autogen.sh - - ./configure --without-gnutls --with-openssl --with-java --without-openssl-version-check --disable-dsa-tests CFLAGS=-g + - ./configure --without-gnutls --with-openssl --with-java --without-openssl-version-check --disable-dsa-tests --enable-ppp-tests CFLAGS=-g - make -j4 # UTF-8 support is not available # OpenSSL 1.1.0 disables 3DES and RC4 by default (https://www.openssl.org/blog/blog/2016/08/24/sweet32/) -- 2.49.0