diff --git a/.github/workflows/callable-browser-tests.yaml b/.github/workflows/callable-browser-tests.yaml index 0e29fa66a..49a8a23c7 100644 --- a/.github/workflows/callable-browser-tests.yaml +++ b/.github/workflows/callable-browser-tests.yaml @@ -148,12 +148,6 @@ jobs: cd ${HOME}/build/ezplatform docker-compose --env-file=.env exec -T --user www-data app sh -c "bin/ezbehat ${{ inputs.test-suite }}" - - if: always() - name: Upload tests report - run: | - cd ${HOME}/build/ezplatform - bin/ezreport - report-results: runs-on: ubuntu-latest timeout-minutes: 3 diff --git a/behat.yml.dist b/behat.yml.dist index 3d38b81b4..5552df6bf 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -3,8 +3,6 @@ default: error_reporting: -1 # Report all PHP errors formatters: pretty: true - allure: - output_path: %paths.base%/build/allure extensions: Behat\MinkExtension: base_url: 'http://localhost' @@ -45,9 +43,6 @@ default: mode: normal limit: 10 - Allure\Behat\AllureFormatterExtension: - image_attachment_limit: 5 - suites: ~ imports: diff --git a/composer.json b/composer.json index 019ce4c25..e02087f94 100644 --- a/composer.json +++ b/composer.json @@ -84,8 +84,6 @@ "behat/mink-selenium2-driver": "^1.4.0", "behat/symfony2-extension": "^2.1.5", "bex/behat-screenshot": "^1.2.7", - "ezsystems/allure-behat": "^2.0@dev", - "ezsystems/allure-php-api": "^2.0@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1.0@dev", "ezsystems/behatbundle": "^7.0.0@dev", "liuggio/fastest": "~1.6.0", diff --git a/doc/docker/Dockerfile-varnish b/doc/docker/Dockerfile-varnish index 61a866571..571917de5 100644 --- a/doc/docker/Dockerfile-varnish +++ b/doc/docker/Dockerfile-varnish @@ -1,9 +1,9 @@ -FROM debian:stretch-slim +FROM debian:bullseye-slim ENV VARNISH_MALLOC_SIZE="256M" \ DEBIAN_FRONTEND=noninteractive -ARG PACKAGECLOUD_URL=https://packagecloud.io/install/repositories/varnishcache/varnish60/script.deb.sh +ARG PACKAGECLOUD_URL=https://packagecloud.io/install/repositories/varnishcache/varnish60lts/script.deb.sh ARG VARNISH_MODULES_VERSION=0.15.0 # Use official packages from Varnish and build with varnish-modules mainly for xkey @@ -19,8 +19,8 @@ RUN set -xe \ libpcre3-dev \ libtool \ pkg-config \ - python-docutils \ - python-sphinx \ + python3-docutils \ + sphinx-common \ varnish-dev \ " \ # Update apt and get dependencies @@ -29,7 +29,7 @@ RUN set -xe \ \ # Get official Varnish package && curl -s ${PACKAGECLOUD_URL} | bash \ - && apt-get install -q -y --allow-unauthenticated --no-install-recommends varnish $buildDeps \ + && apt-get install -q -y --allow-unauthenticated --no-install-recommends varnish=6.0.11-1~bullseye $buildDeps \ \ # Install varnish modules && curl -A "Docker" -o /tmp/varnish-modules.tar.gz -D - -L -s https://github.com/varnish/varnish-modules/archive/refs/tags/${VARNISH_MODULES_VERSION}.tar.gz \