Commit 75fe19cf authored by Thomas Vincent's avatar Thomas Vincent

Merge branch 'ci' into 'master'

Update gitlab-ci

See merge request !76
parents 63638060 64b62225
Pipeline #4741 passed with stages
in 5 minutes and 14 seconds
......@@ -3,17 +3,23 @@ stages:
- test
- deploy
variables: # Global variables
VENV_DIR: xsocs_venv
http_proxy: http://proxy.esrf.fr:3128
https_proxy: http://proxy.esrf.fr:3128
no_proxy: .esrf.fr,localhost
# Target definitions
.build_template: &build_definition
stage: build
image: ${IMAGE}
before_script:
- rm -rf ${VENV_DIR}
- pip install --upgrade virtualenv # Make sure virtualenv is installed
- virtualenv --python=${PYTHON} ${VENV_DIR}
- source ${VENV_DIR}/bin/activate
- pip install --upgrade pip setuptools
- pip install --upgrade -r requirements-dev.txt
# Pinpoint version as sphinx1.7.5 is buggy. Remove this once sphinx1.7.6 is out
- pip install --upgrade sphinx==1.7.4
- which python
- python ./ci/info_platform.py
script:
......@@ -31,8 +37,10 @@ stages:
.test_template: &test_definition
stage: test
image: ${IMAGE}
before_script:
- rm -rf ${VENV_DIR}
- pip install --upgrade virtualenv # Make sure virtualenv is installed
- virtualenv --python=${PYTHON} ${VENV_DIR}
- source ${VENV_DIR}/bin/activate
- pip install --upgrade pip setuptools
......@@ -52,8 +60,8 @@ stages:
# Python2 tasks
.python2_variables:
variables: &python2_definition
IMAGE: python:2.7-jessie
PYTHON: python2
VENV_DIR: py2env
build_python2:
<<: *build_definition
......@@ -69,8 +77,8 @@ test_python2:
# Python3 tasks
.python3_variables:
variables: &python3_definition
IMAGE: python:3.4-jessie
PYTHON: python3
VENV_DIR: py3env
build_python3:
<<: *build_definition
......@@ -86,6 +94,7 @@ test_python3:
# Deploy documentation in gitlab (only for master branch)
pages:
stage: deploy
image: python:3.4-jessie
dependencies:
- build_python3
script:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment