From 5c2cb6c34a7171a2f71d0de3bca699bad77a63cd Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Mon, 8 Feb 2021 18:04:25 +0800 Subject: [PATCH] CI: run interop tests from carddavclient by Michael Stilkerich --- .gitlab-ci.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f18cf00..d1ac7fe7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,16 +83,20 @@ test: - cp -r /var/log/davical davical_log/test -test_bullseye: +test_bullseye_carddavclientinterop: stage: testall image: debian:bullseye artifacts: paths: - testing/report.xml + - carddavclient-master/testreports/unit/results.html - apache2_log/* - davical_log/* + - carddavclient-master/testreports/interop/* reports: - junit: testing/report.xml + junit: + - testing/report.xml + - carddavclient-master/testreports/unit/results.html when: always script: @@ -102,7 +106,7 @@ test_bullseye: - echo "en_NZ.UTF-8 UTF-8" >> /etc/locale.gen - locale-gen - echo "LANG=en_NZ.UTF-8" > /etc/default/locale - - apt-get -y install libdbd-pg-perl libyaml-perl php php-cli php-pgsql php-xml postgresql-client postgresql libapache2-mod-php curl xmlstarlet + - apt-get -y install libdbd-pg-perl libyaml-perl php php-cli php-pgsql php-xml postgresql-client postgresql libapache2-mod-php curl xmlstarlet composer phpunit - curl 'https://gitlab.com/davical-project/awl/-/archive/master/awl-master.tar.gz' | tar zxf - - mv awl-master /usr/share/awl/ - chown -R www-data /usr/share/awl/ @@ -130,6 +134,13 @@ test_bullseye: - apache2ctl start - useradd testrunner - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x' + - cd .. + - curl https://codeload.github.com/mstilkerich/carddavclient/tar.gz/master | tar zxf - + - cd carddavclient-master + - composer install + - echo ' [ "username" => "user3", "password" => "user3", "discoveryUri" => "http://regression", "syncAllowExtraChanges" => false, "featureSet" => TestInfrastructureSrv::SRVFEATS_DAVICAL, ], ]; public const ADDRESSBOOKS = [ "Davical_0" => [ "account" => "Davical", "url" => "http://regression/caldav.php/user3/addresses/", "displayname" => "user3 addresses", ], ]; }' > tests/interop/AccountData.php + - mkdir -p testreports/interop + - phpunit -c tests/interop/phpunit.xml --no-coverage after_script: - mkdir -p apache2_log - cp -r /var/log/apache2 apache2_log/test_bullseye