From 736628c7b296a921e07648572818522e64fa21e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 24 Jul 2019 08:41:27 +0200
Subject: [PATCH] MAINT: comments;whitespace and reactivate test
---
.gitlab-ci.yml | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41878409..85036bc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,32 +37,22 @@ image: $CI_REGISTRY_IMAGE:latest
stages:
- - setup
- - linting
- - test
- - deploy
+ - setup
+ - linting
+ - test
+ - deploy
-#######
-# setup
-#######
-
-### TODO !!! use respective docker image
-######
-# test
-######
-
-# run qunit tests
-test:qunit:
+# run qunit tests and pylint
+test:
tags: [ docker ]
- stage: test
- artifacts:
- paths:
- - public/qunit.log
- - screenlog.*
- script:
- - make pylint
-# TODO fix the following
-# - make run-qunit
+ stage: test
+ artifacts:
+ paths:
+ - public/qunit.log
+ - screenlog.*
+ script:
+ - make pylint
+ - make run-qunit
# Trigger building of server image and integration tests
trigger_build:
--
GitLab