Merge branch 'use_prebuilt_ci_container' into vsvode_1.95.3

.gitlab-ci-template.yml.j2

-image: "ubuntu:20.04"
+image: registry.gitlab.developers.cam.ac.uk/ch/co/wpkg/wpkg-ci-docker:latest
 
 variables:
   GIT_DEPTH: 10

.gitlab-ci.yml

-image: "ubuntu:20.04"
+image: registry.gitlab.developers.cam.ac.uk/ch/co/wpkg/wpkg-ci-docker:latest
 
 variables:
   GIT_DEPTH: 10
@@ -19,7 +19,6 @@ tests:
   stage: lint
   before_script:
     - export DEBIAN_FRONTEND=noninteractive
-    - apt-get update && apt-get install -y python3-nose python3-lxml python3-yaml locales-all
     - export LANG=en_GB.UTF-8
     - export LANGUAGE=en_GB:en
     - export LC_ALL=en_GB.UTF-8
@@ -36,19 +35,15 @@ tests:
 # Filter XML for packages without citest=broken attribute
 buildtemplates:
   before_script:
-    - echo -e "\e[0Ksection_start:`date +%s`:my_first_section[collapsed=true]\r\e[0KBoring, before_script, boilerplate"
-    - export DEBIAN_FRONTEND=noninteractive
-    - apt-get update && apt-get install -y jq python3-demjson libxml2-utils python3-pip curl dos2unix openssh-client zip
+    - echo -e "\e[0Ksection_start:`date +%s`:before_script[collapsed=true]\r\e[0KRunning before_script"
     - export LANG=en_GB.UTF-8
     - export LANGUAGE=en_GB:en
     - export LC_ALL=en_GB.UTF-8
-    - pip3 install jinja-cli
-    - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)
     - if [ -f "$WPKG_XML_TEST_PRIVKEY" ] ; then chmod 400 "$WPKG_XML_TEST_PRIVKEY" ; ssh-add "$WPKG_XML_TEST_PRIVKEY" ; fi
     - if [ -f "$WPKG_XML_KNOWNHOSTS" ] ; then mkdir --mode=0700 ~/.ssh ; cp "$WPKG_XML_KNOWNHOSTS" ~/.ssh/known_hosts ; chmod 0644 ~/.ssh/known_hosts ; fi
     - ssh -l root wpkg-xml-test.ch.private.cam.ac.uk $CI_PROJECT_NAME $CI_COMMIT_BRANCH
-    - echo -e "\e[0Ksection_end:`date +%s`:my_first_section\r\e[0K"
+    - echo -e "\e[0Ksection_end:`date +%s`:before_script\r\e[0K"
   stage: cachecheck
   artifacts:
     paths: