kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Jenkinsfile: shorten stage names for consistency and to fit Jenkins UI

Browse source 
The Blue Ocean UI truncates names, which makes it possible to distinguish
which Windows stage is RS1 or RS5. This patch shortens those names so that they
fit in the Blue Ocean UI.

Other stages and parameters were renamed as well to better reflect what they're running;

Before             | After
-------------------|--------------------------------
janky              | amd64
power              | ppc64le
power-master       | ppc64le integration-cli
windowsRS1         | win-RS1
windowsRS5-process | win-RS5
z                  | s390x
z-master           | x390x integration-cli

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

WIP renames

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-09-10 09:46:19 +02:00
parent 536e26c81a
commit c18f793f40
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Jenkinsfile vendored
View file

@ -8,10 +8,10 @@ pipeline {
timestamps() timestamps()
} }
parameters { parameters {
booleanParam(name: 'unit_validate', defaultValue: true, description: 'x86 unit tests and vendor check') booleanParam(name: 'unit_validate', defaultValue: true, description: 'amd64 (x86_64) unit tests and vendor check')
booleanParam(name: 'janky', defaultValue: true, description: 'x86 Build/Test') booleanParam(name: 'amd64', defaultValue: true, description: 'amd64 (x86_64) Build/Test')
booleanParam(name: 'z', defaultValue: true, description: 'IBM Z (s390x) Build/Test') booleanParam(name: 's390x', defaultValue: true, description: 'IBM Z (s390x) Build/Test')
booleanParam(name: 'powerpc', defaultValue: true, description: 'PowerPC (ppc64le) Build/Test') booleanParam(name: 'ppc64le', defaultValue: true, description: 'PowerPC (ppc64le) Build/Test')
booleanParam(name: 'windowsRS1', defaultValue: true, description: 'Windows 2016 (RS1) Build/Test') booleanParam(name: 'windowsRS1', defaultValue: true, description: 'Windows 2016 (RS1) Build/Test')
booleanParam(name: 'windowsRS5', defaultValue: true, description: 'Windows 2019 (RS5) Build/Test') booleanParam(name: 'windowsRS5', defaultValue: true, description: 'Windows 2019 (RS5) Build/Test')
booleanParam(name: 'skip_dco', defaultValue: false, description: 'Skip the DCO check') booleanParam(name: 'skip_dco', defaultValue: false, description: 'Skip the DCO check')
@ -230,10 +230,10 @@ pipeline {
} }
} }
} }
stage('janky') { stage('amd64') {
when { when {
beforeAgent true beforeAgent true
expression { params.janky } expression { params.amd64 }
} }
agent { label 'amd64 && ubuntu-1804 && overlay2' } agent { label 'amd64 && ubuntu-1804 && overlay2' }
@ -336,7 +336,7 @@ pipeline {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') {
sh ''' sh '''
bundleName=janky bundleName=amd64
echo "Creating ${bundleName}-bundles.tar.gz" echo "Creating ${bundleName}-bundles.tar.gz"
# exclude overlay2 directories # exclude overlay2 directories
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
@ -351,10 +351,10 @@ pipeline {
} }
} }
} }
stage('z') { stage('s390x') {
when { when {
beforeAgent true beforeAgent true
expression { params.z } expression { params.s390x }
} }
agent { label 's390x-ubuntu-1604' } agent { label 's390x-ubuntu-1604' }
// s390x machines run on Docker 18.06, and buildkit has some bugs on that version // s390x machines run on Docker 18.06, and buildkit has some bugs on that version
@ -448,11 +448,11 @@ pipeline {
} }
} }
} }
stage('z-master') { stage('s390x integration-cli') {
when { when {
beforeAgent true beforeAgent true
branch 'master' branch 'master'
expression { params.z } expression { params.s390x }
} }
agent { label 's390x-ubuntu-1604' } agent { label 's390x-ubuntu-1604' }
// s390x machines run on Docker 18.06, and buildkit has some bugs on that version // s390x machines run on Docker 18.06, and buildkit has some bugs on that version
@ -526,13 +526,13 @@ pipeline {
} }
} }
} }
stage('powerpc') { stage('ppc64le') {
when { when {
beforeAgent true beforeAgent true
expression { params.powerpc } expression { params.ppc64le }
} }
agent { label 'ppc64le-ubuntu-1604' } agent { label 'ppc64le-ubuntu-1604' }
// power machines run on Docker 18.06, and buildkit has some bugs on that version // ppc64le machines run on Docker 18.06, and buildkit has some bugs on that version
environment { DOCKER_BUILDKIT = '0' } environment { DOCKER_BUILDKIT = '0' }
stages { stages {
@ -606,7 +606,7 @@ pipeline {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') {
sh ''' sh '''
bundleName=powerpc-integration bundleName=ppc64le-integration
echo "Creating ${bundleName}-bundles.tar.gz" echo "Creating ${bundleName}-bundles.tar.gz"
# exclude overlay2 directories # exclude overlay2 directories
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
@ -621,14 +621,14 @@ pipeline {
} }
} }
} }
stage('powerpc-master') { stage('ppc64le integration-cli') {
when { when {
beforeAgent true beforeAgent true
branch 'master' branch 'master'
expression { params.powerpc } expression { params.ppc64le }
} }
agent { label 'ppc64le-ubuntu-1604' } agent { label 'ppc64le-ubuntu-1604' }
// power machines run on Docker 18.06, and buildkit has some bugs on that version // ppc64le machines run on Docker 18.06, and buildkit has some bugs on that version
environment { DOCKER_BUILDKIT = '0' } environment { DOCKER_BUILDKIT = '0' }
stages { stages {
@ -682,7 +682,7 @@ pipeline {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE', message: 'Failed to create bundles.tar.gz') {
sh ''' sh '''
bundleName=powerpc-integration-cli bundleName=ppc64le-integration-cli
echo "Creating ${bundleName}-bundles.tar.gz" echo "Creating ${bundleName}-bundles.tar.gz"
# exclude overlay2 directories # exclude overlay2 directories
find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz find bundles -path '*/root/*overlay2' -prune -o -type f \\( -name '*.log' -o -name '*.prof' \\) -print | xargs tar -czf ${bundleName}-bundles.tar.gz
@ -697,7 +697,7 @@ pipeline {
} }
} }
} }
stage('windowsRS1') { stage('win-RS1') {
when { when {
beforeAgent true beforeAgent true
expression { params.windowsRS1 } expression { params.windowsRS1 }
@ -758,7 +758,7 @@ pipeline {
} }
} }
} }
stage('windowsRS5-process') { stage('win-RS5') {
when { when {
beforeAgent true beforeAgent true
expression { params.windowsRS5 } expression { params.windowsRS5 }