Refactor out pytest from test.sh and rename to install-packages.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f0c50df6de497272a9cf9e5a64f9029e5c8d7e6..8a8994b5641901be6776cedc3d8ad4f5a55e8a97 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,7 +173,8 @@ portable-source:
 .test_template: &test_definition
     stage: test
     script:
-        - ci/test.sh
+        - ci/install-packages.sh
+        - python3 -m pytest --junitxml=report.xml tests rtest
     artifacts:
         reports:
             junit: ./report.xml

diff --git a/ci/test.sh b/ci/install-packages.sh
similarity index 96%
rename from ci/test.sh
rename to ci/install-packages.sh
index 8db4df30fc3bbb2b9ba58a324106881827fae18c..adc62b27a2ac07cb511e9d2fc7fd69d218ef3fac 100755 (executable)
--- a/ci/test.sh
+++ b/ci/install-packages.sh
@@ -30,4 +30,3 @@ else
         ${DIR}/os/${ARCH}/graphviz-plugins-gd-${GV_VERSION}*.rpm \
         ${DIR}/os/${ARCH}/graphviz-nox-${GV_VERSION}*.rpm
 fi
-python3 -m pytest --junitxml=report.xml tests rtest