Commit e5691b81 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

use debian, improve .gitlab-ci.yml

parent 36efecc3
Pipeline #499 passed with stages
in 2 minutes and 40 seconds
FROM python:alpine3.7
FROM python
EXPOSE 8000
......@@ -7,12 +7,14 @@ WORKDIR /app
ADD requirements.txt ./
ENV PYTHONPATH=/usr/lib/python3.6/site-packages
RUN apk update -q && apk add -q --no-cache \
RUN apt-get update -qq && apt-get install -qqy \
git \
py3-psycopg2 \
libpq-dev \
netcat-openbsd \
&& pip3 install --no-cache-dir -r requirements.txt \
gunicorn
gunicorn \
psycopg2 \
python-memcached
ADD . .
......
......@@ -145,5 +145,5 @@ DJANGO_TABLES2_TEMPLATE = 'rainboard/tables.html'
RAINBOARD_DATA = Path('/srv/dashboard')
RAINBOARD_GITS = RAINBOARD_DATA / 'repositories'
RAINBOARD_RPKG = RAINBOARD_DATA / 'robotpkg'
PRIVATE_REGISTRY = 'eur0c.laas.fr:4567'
PRIVATE_REGISTRY = 'gepgitlab.laas.fr:4567'
PUBLIC_REGISTRY = 'eur0c.laas.fr:5000'
variables:
GIT_SSL_NO_VERIFY: "true"
GIT_SUBMODULE_STRATEGY: "recursive"
GIT_DEPTH: "3"
NAMESPACE: {{ project.main_namespace.slug }}
PROJECT: {{ project }}
REGISTRY: {{ project.registry }}
IMAGE: "${REGISTRY}/${NAMESPACE}/${PROJECT}"
CCACHE_BASEDIR: "$${CI_PROJECT_DIR}"
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
cache:
paths:
- build/ccache
- ccache
{% for robotpkg in project.robotpkg_set.all %}
.robotpkg-{{ robotpkg }}: &robotpkg-{{ robotpkg }}
......@@ -17,19 +18,13 @@ cache:
ROBOTPKG: {{ robotpkg }}
CATEGORY: {{ robotpkg.category }}
before_script:
- mkdir -p build/ccache
- cd build
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache
- mkdir -p ccache
script:
- cd /root/robotpkg/${CATEGORY}/${ROBOTPKG}
- git pull
- echo "MASTER_REPOSITORY = git ${CI_PROJECT_DIR}" >> Makefile
- echo "REPOSITORY.{{ robotpkg }} = git ${CI_PROJECT_DIR}" >> /opt/openrobots/etc/robotpkg.conf
- make checkout
- make install
- cd work.*/${PROJECT}*/
{% if project.tests %}- make test{% endif %}
- make install WRKSRC=${CI_PROJECT_DIR}
- cd ${CI_PROJECT_DIR}
{% if project.tests %}- make check{% endif %}
{% if project.docs %}- make doc{% endif %}
except:
- gh-pages
......@@ -38,6 +33,12 @@ cache:
robotpkg-{{ image }}:
<<: *robotpkg-{{ robotpkg }}
image: ${IMAGE}:{{ image.get_target_display }}
{% if projectsdocs and image.get_target_display == '16.04'%}
artifacts:
expire_in: 1 day
paths:
- doc/doxygen-html/
{% endif %}
{% endfor %}
{% endfor %}
......@@ -2,5 +2,4 @@ ndh
django-filter
django-tables2
gitpython
python-memcached
requests
......@@ -9,15 +9,13 @@ chardet==3.0.4 # via requests
django-autoslug-iplweb==1.9.4.dev0 # via ndh
django-bootstrap4==0.0.6 # via ndh
django-filter==1.1.0
django==2.0.3 # via django-tables2, ndh
django==2.0.4 # via django-tables2, ndh
gitdb2==2.0.3 # via gitpython
gitpython==2.1.8
gitpython==2.1.9
idna==2.6 # via requests
ndh==3.2.1
python-memcached==1.59
ndh==3.5.1
pytz==2018.3 # via django
requests==2.18.4
six==1.11.0 # via python-memcached
smmap2==2.0.3 # via gitdb2
urllib3==1.22 # via requests
https://github.com/jieter/django-tables2/archive/two.zip
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