From 3e8f90c15994a5f3163ba9977c5a61066710f2f7 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 14 Jul 2019 12:58:05 +0200 Subject: [PATCH] Jenkins: Always use Debian buster as base --- Jenkinsfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce626f070..3048a9dfb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ def pys = [ - [name: 'Python 3.7', docker:'python:3.7-stretch', tox:'py37,flake8', main: true], - [name: 'Python 3.6', docker:'python:3.6-stretch', tox:'py36', main: false], - [name: 'Python 3.5', docker:'python:3.5-jessie', tox:'py35', main: false], - [name: 'Python 2.7', docker:'python:2.7-stretch', tox:'py27', main: false] + [name: 'Python 3.7', docker:'python:3.7-buster', tox:'py37,flake8', main: true], + [name: 'Python 3.6', docker:'python:3.6-buster', tox:'py36', main: false], + [name: 'Python 3.5', docker:'python:3.5-buster', tox:'py35', main: false], + [name: 'Python 2.7', docker:'python:2.7-buster', tox:'py27', main: false] ] properties([ @@ -79,10 +79,6 @@ timestamps { def buildDockerfile(image) { def uid = sh(returnStdout: true, script: 'id -u').trim() def toxInst = 'apt-get update && apt-get -y install tox' - if (image.contains('jessie')) { - toxInst = 'pip install tox' // Dirty! - } - writeFile file: 'Dockerfile', text: """ FROM $image RUN $toxInst