From 0cf9cfc73ab3a17189f80e5e0a51036644c9c8a7 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <puck@catalyst.net.nz>
Date: Sat, 5 Feb 2022 16:35:25 +1300
Subject: [PATCH] Switch testing to Bullseye, drop Stretch

---
 .gitlab-ci.yml | 71 +++++---------------------------------------------
 1 file changed, 7 insertions(+), 64 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1ac7fe7..a39b94ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,9 +149,9 @@ test_bullseye_carddavclientinterop:
     - cp -r /var/log/davical davical_log/test_bullseye
 
 
-build_buster_latestphp:
+build_bullseye_latestphp:
   stage: testall
-  image: php:apache-buster
+  image: php:apache-bullseye
   script:
     - apt-get -y update
     - bash -c 'mkdir -p /usr/share/man/man{0..10}'
@@ -174,9 +174,9 @@ build_buster_latestphp:
     paths:
       - '*.deb'
 
-test_buster_latestphp:
+test_bullseye_latestphp:
   stage: testall
-  image: php:apache-buster
+  image: php:apache-bullseye
   artifacts:
     paths:
       - testing/report.xml
@@ -226,64 +226,7 @@ test_buster_latestphp:
     - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
   after_script:
     - mkdir -p apache2_log
-    - cp -r /var/log/apache2 apache2_log/test_buster_latestphp
-    - bzip2 apache2_log/test_buster_latestphp/*
+    - cp -r /var/log/apache2 apache2_log/test_bullseye_latestphp
+    - bzip2 apache2_log/test_bullseye_latestphp/*
     - mkdir -p davical_log
-    - cp -r /var/log/davical davical_log/test_buster_latestphp
-
-
-test_stretch_latestphp:
-  stage: testall
-  image: php:apache-stretch
-  artifacts:
-    paths:
-      - testing/report.xml
-      - apache2_log/*
-      - davical_log/*
-    reports:
-      junit: testing/report.xml
-    when:
-      always
-  script:
-    - apt-get -y update
-    - bash -c 'mkdir -p /usr/share/man/man{0..10}'
-    - apt-get -y install locales
-    - 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 perl postgresql postgresql-client libpq-dev xmlstarlet
-    - 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/
-    - dpkg --ignore-depends=php,php-pgsql,php-xml,libawl-php,php-cli -i *.deb
-    - docker-php-ext-install -j$(nproc) pgsql
-    - docker-php-ext-install -j$(nproc) pdo_pgsql
-    - docker-php-ext-install -j$(nproc) calendar
-    - echo '127.0.1.1  regression mycaldav myempty' >> /etc/hosts
-    - cp testing/apache-site.conf.example /etc/apache2/sites-enabled/davical-regression.conf
-    - sed -i 's/\/path\/to/\/usr\/share/g' /etc/apache2/sites-enabled/davical-regression.conf
-    - mkdir /usr/share/davical/testing/
-    - cp testing/*.php /usr/share/davical/testing/
-    - rm /etc/davical/config.php
-    - cat testing/regression-conf.php.example | sed 's.//$c->dbg.$c->dbg.' > /etc/davical/regression-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/mycaldav-conf.php
-    - ln -s /etc/davical/regression-conf.php /etc/davical/myempty-conf.php
-    - mkdir -p /var/log/davical
-    - chown www-data /var/log/davical
-    - sed -i '/peer/d' /etc/postgresql/9.6/main/pg_hba.conf
-    - echo 'local  all  all  trust' >> /etc/postgresql/9.6/main/pg_hba.conf
-    - pg_ctlcluster 9.6 main start
-    - su postgres -c 'createuser davical_dba --createdb --createrole --superuser'
-    - su postgres -c 'createuser davical_app --superuser'
-    - su postgres -c 'createuser testrunner --superuser'
-    - pg_ctlcluster 9.6 main restart
-    - a2enmod rewrite
-    - apache2ctl start
-    - useradd testrunner
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling" ./run_regressions.sh all x'
-  after_script:
-    - mkdir -p apache2_log
-    - cp -r /var/log/apache2 apache2_log/test_stretch_latestphp
-    - bzip2 apache2_log/test_stretch_latestphp/*
-    - mkdir -p davical_log
-    - cp -r /var/log/davical davical_log/test_stretch_latestphp
+    - cp -r /var/log/davical davical_log/test_bullseye_latestphp