From: Michał Kępień <michal@isc.org>
Date: Fri, 18 Jan 2019 13:28:47 +0000 (+0100)
Subject: Remove unused parts of .gitlab-ci.yml
X-Git-Tag: v9.13.6~47^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9893bd32463a3808bc1048a3539f854ac6ea1bec;p=thirdparty%2Fbind9.git

Remove unused parts of .gitlab-ci.yml

Remove the following from .gitlab-ci.yml:

  - unused variable definitions,
  - unused Docker image definitions,
  - commands which have no effect,
  - sections which were commented out.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 853d27580c4..f3bfe9e6e3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 variables:
   DEBIAN_FRONTEND: noninteractive
   LC_ALL: C
-  DOCKER_DRIVER: overlay2
   CI_REGISTRY_IMAGE: registry.gitlab.isc.org/isc-projects/images/bind9
   CCACHE_DIR: "/ccache"
   SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
@@ -54,20 +53,6 @@ stages:
     - docker
     - i386
 
-.debian-buster-amd64: &debian_buster_amd64_image
-  image: "$CI_REGISTRY_IMAGE:debian-buster-amd64"
-  tags:
-    - linux
-    - docker
-    - amd64
-
-.debian-buster-i386:: &debian_buster_i386_image
-  image: "$CI_REGISTRY_IMAGE:debian-buster-i386"
-  tags:
-    - linux
-    - docker
-    - i386
-
 .debian-sid-amd64: &debian_sid_amd64_image
   image: "$CI_REGISTRY_IMAGE:debian-sid-amd64"
   tags:
@@ -114,7 +99,6 @@ stages:
   stage: build
   before_script:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
-#    - ./autogen.sh
   script:
     - ./configure --enable-developer --with-libtool --disable-static --with-cmocka --prefix=$HOME/.local --without-make-clean $EXTRA_CONFIGURE || cat config.log
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
@@ -128,8 +112,6 @@ stages:
 
 .install_test: &install_test_job
   stage: test
-  before_script:
-    - mkdir $HOME/.local
   script:
     - make install
 
@@ -137,7 +119,6 @@ stages:
   stage: test
   retry: 2
   before_script:
-    - rm -rf .ccache
     - bash -x bin/tests/system/ifconfig.sh up
     - bash -x util/prepare-softhsm2.sh
   script:
@@ -228,30 +209,6 @@ docs:push:
   - master@isc-projects/bind9
   - /^v9_.*$/@isc-projects/bind9
 
-#jessie:amd64:build:
-#  <<: *debian_jessie_amd64_image
-#  <<: *build_job
-#
-#build:jessie:i386:
-#  <<: *debian_jessie_i386_image
-#  <<: *build_job
-#
-#build:stretch:amd64:
-#  <<: *debian_stretch_amd64_image
-#  <<: *build_job
-#
-#build:debian:buster:i386:
-#  <<: *debian_buster_i386_image
-#  <<: *build_job
-#
-#build:ubuntu:bionic:amd64:
-#  <<: *ubuntu_bionic_amd64_image
-#  <<: *build_job
-#
-#build:ubuntu:xenial:i386:
-#  <<: *ubuntu_xenial_i386_image
-#  <<: *build_job
-
 centos6:amd64:build:
   variables:
     CC: gcc