fixup! fixup! fixup! fixup! CI: Massive update of build and test runners

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ce97ffa04747146b6d3b3ee69e3b6bb55f3e869..25cb9fc50843c361976478b0ab6208d45ec21bce 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,11 +194,6 @@ docker-opensuse-15.5-amd64:
     IMG_NAME: "opensuse-15.5-amd64"
   <<: *docker_build
 
-docker-ubuntu-16_04-amd64:
-  variables:
-    IMG_NAME: "ubuntu-16.04-amd64"
-  <<: *docker_build
-
 docker-ubuntu-18_04-amd64:
   variables:
     IMG_NAME: "ubuntu-18.04-amd64"
@@ -380,10 +375,6 @@ build-opensuse-15.5-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
 
-build-ubuntu-16_04-amd64:
-  <<: *build-linux
-  image: registry.nic.cz/labs/bird:ubuntu-16.04-amd64
-
 build-ubuntu-18_04-amd64:
   <<: *build-linux
   image: registry.nic.cz/labs/bird:ubuntu-18.04-amd64
@@ -673,11 +664,6 @@ pkg-opensuse-15.5-amd64:
   needs: [build-opensuse-15.5-amd64]
   image: registry.nic.cz/labs/bird:opensuse-15.5-amd64
 
-pkg-ubuntu-16.04-amd64:
-  <<: *pkg-deb-legacy
-  needs: [build-ubuntu-16_04-amd64]
-  image: registry.nic.cz/labs/bird:ubuntu-16.04-amd64
-
 pkg-ubuntu-18.04-amd64:
   <<: *pkg-deb-legacy
   needs: [build-ubuntu-18_04-amd64]

diff --git a/misc/docker/ubuntu-16.04-amd64/Dockerfile b/misc/docker/ubuntu-16.04-amd64/Dockerfile
deleted file mode 100644 (file)
index af0eecf..0000000
--- a/misc/docker/ubuntu-16.04-amd64/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# bump number for image rebuild: 0
-FROM ubuntu:16.04
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get -y update
-RUN apt-get -y upgrade
-RUN apt-get -y --no-install-recommends install \
-       tzdata \
-       build-essential \
-       flex \
-       bison \
-       autoconf \
-       ncurses-dev \
-       libreadline-dev \
-       libssh-gcrypt-dev \
-       linuxdoc-tools-latex \
-       texlive-latex-extra \
-       opensp \
-       docbook-xsl \
-       xsltproc
-RUN apt-get -y --no-install-recommends install \
-       git \
-       dpkg-dev \
-       debhelper \
-       apt-utils \
-       quilt \
-       python3 \
-       python3-pip \
-       python3-venv