From b85681d0126a61c26166f0d52053c0f6d069bf8e Mon Sep 17 00:00:00 2001 From: lguohan Date: Wed, 17 Jun 2020 03:45:47 -0700 Subject: [PATCH] move build job to build worker and kvm test to kvmtest workers (#113) there will be three roles of workers - jenkins-build-workers - jenkins-vstest-workers - jenkins-kvmtest-workers The build workers are mainly for build the image. The vstest workers are mainly for swss/sonic-utilities vs tests The kvmtest workers are manly for sonic-mgmt kvm tests The vstest and kvmtest can share the same physical servers. However, to help debug, we introduce two roles so that they can be separated to avoid their jobs affecting each other. --- jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile | 6 +++--- jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile | 6 +++--- jenkins/vs/buildimage-vs-all/Jenkinsfile | 2 +- jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile | 2 +- jenkins/vs/buildimage-vs-image-buster/Jenkinsfile | 2 +- jenkins/vs/buildimage-vs-image-pr/Jenkinsfile | 4 ++-- jenkins/vs/buildimage-vs-image-test/Jenkinsfile | 2 +- jenkins/vs/buildimage-vs-image/Jenkinsfile | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile b/jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile index efd5f439cef3..69bca2e6907b 100644 --- a/jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile +++ b/jenkins/mgmt/sonic-mgmt-canary/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { - agent { - node { label 'jenkins-vstest-workers' } + agent { + node { label 'jenkins-kvmtest-workers' } } options { @@ -41,7 +41,7 @@ pipeline { junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/**/*.xml') archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**') } - } + } } } diff --git a/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile b/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile index e2ffcc0edb43..9d3570743fa3 100644 --- a/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile +++ b/jenkins/mgmt/sonic-mgmt-pr/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { - agent { - node { label 'jenkins-vstest-workers' } + agent { + node { label 'jenkins-kvmtest-workers' } } options { @@ -38,7 +38,7 @@ pipeline { junit(allowEmptyResults: true, keepLongStdio: true, testResults: 'sonic-mgmt/tests/results/**/*.xml') archiveArtifacts(artifacts: 'sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**') } - } + } } } diff --git a/jenkins/vs/buildimage-vs-all/Jenkinsfile b/jenkins/vs/buildimage-vs-all/Jenkinsfile index 17db1db6426c..4eee6db0c08d 100644 --- a/jenkins/vs/buildimage-vs-all/Jenkinsfile +++ b/jenkins/vs/buildimage-vs-all/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { node { label 'jenkins-kvmtest-workers' } } + agent { node { label 'jenkins-build-workers' } } options { buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')) diff --git a/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile b/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile index 83d99745418c..6a8097f3ad6f 100644 --- a/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile +++ b/jenkins/vs/buildimage-vs-image-201911-test/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { node { label 'jenkins-vstest-workers' } } + agent { node { label 'jenkins-kvmtest-workers' } } parameters { string(name: 'PROJECT', defaultValue: 'vs/buildimage-vs-image-201911', description: 'which project to test') diff --git a/jenkins/vs/buildimage-vs-image-buster/Jenkinsfile b/jenkins/vs/buildimage-vs-image-buster/Jenkinsfile index aa5d3f1d3428..f577bbc60515 100644 --- a/jenkins/vs/buildimage-vs-image-buster/Jenkinsfile +++ b/jenkins/vs/buildimage-vs-image-buster/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { node { label 'jenkins-kvmtest-workers' } } + agent { node { label 'jenkins-build-workers' } } options { buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')) diff --git a/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile b/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile index ea4d2f139613..fe677ce54acd 100644 --- a/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile +++ b/jenkins/vs/buildimage-vs-image-pr/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { node { label 'jenkins-kvmtest-workers' } } + agent { node { label 'jenkins-build-workers' } } options { buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '60')) @@ -49,7 +49,7 @@ sudo cp ../target/sonic-vs.bin /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUM } stage('Test') { - agent { node { label 'jenkins-vstest-workers' } } + agent { node { label 'jenkins-kvmtest-workers' } } steps { dir('sonic-mgmt') { diff --git a/jenkins/vs/buildimage-vs-image-test/Jenkinsfile b/jenkins/vs/buildimage-vs-image-test/Jenkinsfile index cfbc90719ba1..20aaa1912427 100644 --- a/jenkins/vs/buildimage-vs-image-test/Jenkinsfile +++ b/jenkins/vs/buildimage-vs-image-test/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { node { label 'jenkins-vstest-workers' } } + agent { node { label 'jenkins-kvmtest-workers' } } parameters { string(name: 'PROJECT', defaultValue: 'vs/buildimage-vs-image', description: 'which project to test') diff --git a/jenkins/vs/buildimage-vs-image/Jenkinsfile b/jenkins/vs/buildimage-vs-image/Jenkinsfile index 7877a990265f..1320d1fe109d 100644 --- a/jenkins/vs/buildimage-vs-image/Jenkinsfile +++ b/jenkins/vs/buildimage-vs-image/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent { node { label 'jenkins-kvmtest-workers' } } + agent { node { label 'jenkins-build-workers' } } options { buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')) @@ -61,7 +61,7 @@ sudo cp ../target/sonic-vs-dbg.bin /nfs/jenkins/sonic-vs-dbg-${JOB_NAME##*/}.${B } stage('Test') { - agent { node { label 'jenkins-vstest-workers' } } + agent { node { label 'jenkins-kvmtest-workers' } } steps { dir('sonic-mgmt') {