attempt #5

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09a70da39f697b6f8579091d4e5878b928430f59..f0e246c6f1816355efae8fc88b7f0a16bea3ff47 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+
+
 variables:
   # Not normally needed, but may be if some script uses `apt-get install`.
   DEBIAN_FRONTEND: noninteractive
@@ -6,27 +8,20 @@ variables:
 
   CI_REGISTRY_IMAGE: registry.gitlab.isc.org/isc-projects/images/bind9
 
-.linux-amd64: &linux_amd64
-  tags:
-    - linux
-    - amd64
-
-.debian-stretch-amd64: &debian_stretch_amd64_image
-  image: "$CI_REGISTRY_IMAGE:debian-stretch-amd64"
-  <<: *linux_amd64
-
 stages:
   - setup
   - test
 
 ci-setup:
   stage: setup
+  image: "$CI_REGISTRY_IMAGE:debian-stretch-amd64"
   script:
-    - echo $CI_REGISTRY_NAME
+    - echo $CI_REGISTRY_IMAGE
     - cat /etc/motd
     - sudo apt install shellcheck
 
 shellcheck:
+  image: "$CI_REGISTRY_IMAGE:debian-stretch-amd64"
   script:
     - SCRIPTS="src/bin/keactrl/keactrl.in src/bin/admin/kea-admin.in src/bin/admin/admin-utils.sh"
     - shellcheck ${SCRIPTS}