From: Andreas Schneider <asn@samba.org>
Date: Tue, 20 Nov 2018 07:16:42 +0000 (+0100)
Subject: gitlab-ci: Move before and after script to shared template
X-Git-Tag: ldb-1.6.1~426
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=5aee11c28693270aebc2abe5962fcca9d4cb4626;p=samba.git

gitlab-ci: Move before and after script to shared template

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5379d00750f..cfa2ab1b6bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,23 +7,21 @@ variables:
   GIT_STRATEGY: fetch
   GIT_DEPTH: "3"
 
-before_script:
-  - echo "Build starting (preparing swap)..."
-  - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
-      sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
-      sudo mkswap /samba-swap;
-      sudo swapon /samba-swap;
-    fi
-
-after_script:
-  - tar -xf logs.tar.gz system-info.txt -O
-
 .shared_template: &shared_template
   image: $CI_REGISTRY/$SAMBA_BUILD_IMAGES_PROJECT:$SAMBA_BUILD
   stage: build
   tags:
     - docker
     - shared
+  before_script:
+    - echo "Build starting (preparing swap)..."
+    - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then
+        sudo dd if=/dev/zero of=/samba-swap bs=1M count=6144;
+        sudo mkswap /samba-swap;
+        sudo swapon /samba-swap;
+      fi
+  after_script:
+    - tar -xf logs.tar.gz system-info.txt -O
 
 build_samba_none_env:
   <<: *shared_template