linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade CI environment to python3

Browse Source 
base on python3 buster base image and adjust.

Change-Id: I6367b447ecdb230584036ffab1606cd5878f3d0d
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21321
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
This commit is contained in:
Björn Pedersen 2019-09-26 08:01:35 +02:00 committed by Bjoern Pedersen
parent 31fdeb7aa8
commit 874faf695f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ci/Dockerfile
View File

@ -1,17 +1,18 @@
FROM debian:8 AS base FROM python:3-buster AS base
ARG PYVER=python3
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get upgrade && \ apt-get upgrade -y && \
apt-get install --no-install-recommends --no-install-suggests -y \ apt-get install --no-install-recommends --no-install-suggests -y \
gcc \ gcc \
git \ git \
openssh-client \ openssh-client \
make \ make \
locales \ locales \
python \ python3 \
python-dev \ python3-dev \
python-pytango \ python3-pytango \
python-virtualenv \ python3-venv python3-setuptools \
virtualenv virtualenv
@ -31,11 +32,11 @@ RUN virtualenv /home/jenkins/tools2 && \
pip install /home/jenkins/tools2src/ && \ pip install /home/jenkins/tools2src/ && \
rm -rf /home/jenkins/tools2src rm -rf /home/jenkins/tools2src
RUN virtualenv --system-site-packages /home/jenkins/secopvenv && \ RUN virtualenv -p /usr/bin/python3 --system-site-packages /home/jenkins/secopvenv && \
git clone https://forge.frm2.tum.de/review/sine2020/secop/playground /home/jenkins/playground && \ git clone https://forge.frm2.tum.de/review/sine2020/secop/playground /home/jenkins/playground && \
. /home/jenkins/secopvenv/bin/activate && \ . /home/jenkins/secopvenv/bin/activate && \
pip install -U pip wheel setuptools && \ pip install -U pip wheel setuptools && \
pip install -r /home/jenkins/playground/requirements-dev.txt -r /home/jenkins/playground/requirements.txt && \ pip install -r /home/jenkins/playground/requirements-dev.txt -r /home/jenkins/playground/requirements.txt pylint pytest && \
rm -rf /home/jenkins/playground rm -rf /home/jenkins/playground

4
ci/Jenkinsfile vendored
View File

@ -238,11 +238,11 @@ node("dockerhost") {
parallel 'Test': { parallel 'Test': {
img.inside { img.inside {
run_tests('python2') run_tests('python3')
}}, }},
'Pylint': { 'Pylint': {
img.inside { img.inside {
run_pylint('python2') run_pylint('python3')
}}, }},
'Docs': { 'Docs': {
docimg.inside { docimg.inside {