From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Wed, 1 Apr 2020 10:12:01 +0000 (+0200)
Subject: Use template for test
X-Git-Tag: 2.44.1~79^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c1c4ccac6b39435beef986cec883b760005b647;p=graphviz

Use template for test
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10dc3ee3d..c2b1b9ea2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,6 +74,22 @@ portable-source:
     except:
         - tags
 
+.test_template: &deb_test_definition
+    stage: test
+    script:
+        - cat /etc/os-release
+        - GV_VERSION=$( cat VERSION )
+        - COLLECTION=$( cat COLLECTION )
+        - zcat graphviz-${GV_VERSION}.tar.gz | tar xf -
+        - . /etc/os-release
+        - DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
+        - ARCH=$( uname -m )
+        - apt install ./${DIR}/os/${ARCH}/libgraphviz4_${GV_VERSION}-1_amd64.deb
+        - apt install ./${DIR}/os/${ARCH}/graphviz_${GV_VERSION}-1_amd64.deb
+        - cd graphviz-${GV_VERSION}
+        - ./configure
+        - make -C tests/regression_tests/shapes check
+
 centos6-build:
     <<: *rpm_build_definition
     tags:
@@ -159,26 +175,10 @@ ubuntu19-10-build:
     image: "graphviz/graphviz:ubuntu-19.10"
 
 ubuntu19-10-test:
-    stage: test
-    script:
-        - cat /etc/os-release
-        - ls -lt
-        - GV_VERSION=$( cat VERSION )
-        - COLLECTION=$( cat COLLECTION )
-        - zcat graphviz-${GV_VERSION}.tar.gz | tar xf -
-        - . /etc/os-release
-        - DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
-        - ARCH=$( uname -m )
-        - find Packages
-        - apt install ./${DIR}/os/${ARCH}/libgraphviz4_${GV_VERSION}-1_amd64.deb
-        - apt install ./${DIR}/os/${ARCH}/graphviz_${GV_VERSION}-1_amd64.deb
-        - cd graphviz-${GV_VERSION}
-        - ./configure
-        - make -C tests/regression_tests/shapes check
+    <<: *deb_test_definition
+    tags:
+        - linux
     image: "graphviz/graphviz:ubuntu-19.10"
-    only:
-        - master
-        - run-tests-on-gitlab-runners
 
 deployment:
     stage: deploy