Merge pull request #45411 from thaJeztah/20.10_backport_jenkinsfile_ubuntu_2004
[20.10 backport] Jenkinsfile: use Ubuntu 20.04
This commit is contained in:
commit
66ce8ec8e0
1 changed files with 4 additions and 4 deletions
8
Jenkinsfile
vendored
8
Jenkinsfile
vendored
|
@ -45,7 +45,7 @@ pipeline {
|
|||
beforeAgent true
|
||||
expression { params.dco }
|
||||
}
|
||||
agent { label 'amd64 && ubuntu-1804 && overlay2' }
|
||||
agent { label 'arm64 && ubuntu-2004' }
|
||||
steps {
|
||||
sh '''
|
||||
docker run --rm \
|
||||
|
@ -63,7 +63,7 @@ pipeline {
|
|||
beforeAgent true
|
||||
expression { params.unit_validate }
|
||||
}
|
||||
agent { label 'amd64 && ubuntu-1804 && overlay2' }
|
||||
agent { label 'amd64 && ubuntu-2004 && overlay2' }
|
||||
environment {
|
||||
// On master ("non-pull-request"), force running some validation checks (vendor, swagger),
|
||||
// even if no files were changed. This allows catching problems caused by pull-requests
|
||||
|
@ -249,7 +249,7 @@ pipeline {
|
|||
beforeAgent true
|
||||
expression { params.amd64 }
|
||||
}
|
||||
agent { label 'amd64 && ubuntu-1804 && overlay2' }
|
||||
agent { label 'amd64 && ubuntu-2004 && overlay2' }
|
||||
|
||||
stages {
|
||||
stage("Print info") {
|
||||
|
@ -378,7 +378,7 @@ pipeline {
|
|||
beforeAgent true
|
||||
expression { params.rootless }
|
||||
}
|
||||
agent { label 'amd64 && ubuntu-1804 && overlay2' }
|
||||
agent { label 'amd64 && ubuntu-2004 && overlay2' }
|
||||
stages {
|
||||
stage("Print info") {
|
||||
steps {
|
||||
|
|
Loading…
Add table
Reference in a new issue