0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40782 from thaJeztah/19.03_backport_switch_to_s390x_ubuntu_1804

Browse source 
[19.03 backport] Switch to s390x Ubuntu 18.04
This commit is contained in:
Tibor Vass 2020-04-30 08:26:41 -07:00 • committed by GitHub
commit 3677003554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jenkinsfile vendored
View file

@ -265,7 +265,7 @@ pipeline {
sh '''
# todo: include ip_vs in base image
sudo modprobe ip_vs
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
'''
}
@ -275,7 +275,7 @@ pipeline {
sh '''#!/bin/bash
# bash is needed so 'jobs -p' works properly
# it also accepts setting inline envvars for functions without explicitly exporting
run_tests() {
[ -n "$TESTDEBUG" ] && rm= || rm=--rm;
docker run $rm -t --privileged \
@ -375,9 +375,7 @@ pipeline {
beforeAgent true
expression { params.s390x }
}
agent { label 's390x-ubuntu-1604' }
// s390x machines run on Docker 18.06, and buildkit has some bugs on that version
environment { DOCKER_BUILDKIT = '0' }
agent { label 's390x-ubuntu-1804' }
stages {
stage("Print info") {
@ -483,9 +481,7 @@ pipeline {
not { changeRequest() }
expression { params.s390x }
}
agent { label 's390x-ubuntu-1604' }
// s390x machines run on Docker 18.06, and buildkit has some bugs on that version
environment { DOCKER_BUILDKIT = '0' }
agent { label 's390x-ubuntu-1804' }
stages {
stage("Print info") {