From 4bec3aced920dbd5a1f9d6a468667ac5f176e789 Mon Sep 17 00:00:00 2001
From: Jennifer Rinker <rink@win.dtu.dk>
Date: Thu, 3 May 2018 08:54:02 +0200
Subject: [PATCH] updating ci yml comments
---
.gitlab-ci.yml | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b18b641..fadbc1a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,18 @@
-image: rinkdtu/topfarm-ci:latest # use Neil Davis's pungi image from dockerhub
+# ===== DEFINE DOCKER IMAGE =====
+# 2018.05.03 dockerhub image generated using docker/Dockerfile_simple
+image: rinkdtu/topfarm-ci:latest
+
# ===== TEST TOPFARM =====
test_topfarm: # name the job what we like
stage: # build, test, deploy defined by default [2]
test
script:
- #- REPO_URL="git@${SITE_URL}:WAsP/waspy.git"
- #- REPO_DIR=thirdparty/waspy
- #- rm -fr $REPO_DIR
- #- git clone $REPO_URL $REPO_DIR
- #- cd $REPO_DIR
- #- python setup.py install
- #- cd -
- # - python setup.py install
- cd tests; py.test --cov-report term-missing:skip-covered --cov=topfarm
only: # only run for these branches
- master
- test_ci
- tags:
+ tags: # select which runners can do this job [3]
- python
@@ -25,9 +20,9 @@ test_topfarm: # name the job what we like
pages: # "pages" is a job specifically for GitLab pages [1]
stage: # build, test, deploy defined by default [2]
deploy
- script:
- - cd docs; make html # use sphinx to build docs
- - cd ../; mv docs/build/html public/ # move build to public page
+ script: # use sphinx to build docs, move to public page
+ - cd docs; make html
+ - cd ../; mv docs/build/html public/
artifacts: # required for GitLab pages [1]
paths:
- public
--
GitLab