From a385982607ea69fcd53a39ec798ae4be3479eb50 Mon Sep 17 00:00:00 2001
From: Matthieu Boileau <matthieu.boileau@math.unistra.fr>
Date: Mon, 4 Dec 2017 09:24:47 +0100
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53cfe5a..ed9a6c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,8 @@ variables:
b:docker:
stage: build
tags:
- - shell, docker
+ - shell
+ - docker
script:
- echo $DOCKERHUB_PASSWD | docker login -u $DOCKERHUB_USERNAME --password-stdin
- docker build --pull -t $CONTAINER_TEST_IMAGE -f ./docker/Dockerfile-rosen .
@@ -21,7 +22,8 @@ t:rosen-py36:
stage: test
image: $CONTAINER_TEST_IMAGE
tags:
- - tp-gitlab-ci, docker-exec
+ - tp-gitlab-ci
+ - docker-exec
script:
- make clean && make
- pytest -v
@@ -30,7 +32,8 @@ t:rosen-py27:
stage: test
image: $CONTAINER_TEST_IMAGE
tags:
- - tp-gitlab-ci, docker-exec
+ - tp-gitlab-ci
+ - docker-exec
script:
- source /home/euler/py27/bin/activate
- make clean && make
@@ -39,7 +42,8 @@ t:rosen-py27:
r:docker:
stage: release
tags:
- - shell, docker
+ - shell
+ - docker
script:
- echo $DOCKERHUB_PASSWD | docker login -u $DOCKERHUB_USERNAME --password-stdin
- docker pull $CONTAINER_TEST_IMAGE
--
GitLab