From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 26 Feb 2019 19:24:36 +0000 (+0100)
Subject: gitlab-ci simplified
X-Git-Tag: 465-add-subnet4-update-and-subnet6-update-commands-to-subnet-cmds-hook_base2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d528691d73c88afa19e02d440526e12afab3841;p=thirdparty%2Fkea.git

gitlab-ci simplified
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 069eec1e09..a7db392593 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,19 +9,13 @@ variables:
   CI_REGISTRY_IMAGE: registry.gitlab.isc.org/isc-projects/images/bind9
 
 stages:
-  - setup
   - test
 
-ci-setup:
-  stage: setup
-  image: "$CI_REGISTRY_IMAGE:debian-stretch-amd64"
-  script:
-    - cat /etc/debian_version
-    - sudo apt-get -y install shellcheck
-
 shellcheck:
   stage: test
   image: "$CI_REGISTRY_IMAGE:debian-stretch-amd64"
+  before_script:
+    - sudo apt-get -y install shellcheck
   script:
     - SCRIPTS="src/bin/keactrl/keactrl.in src/bin/admin/kea-admin.in src/bin/admin/admin-utils.sh"
     - shellcheck ${SCRIPTS}