From 934173d59b55f9e520ff45adf6a57538fad316f9 Mon Sep 17 00:00:00 2001 From: lguohan Date: Sat, 27 Jul 2019 12:05:50 -0700 Subject: [PATCH] [jenkins]: pull sonic-slave-stretch docker from reg for swss and utilities build (#52) Signed-off-by: Shu0T1an ChenG --- jenkins/common/sonic-utilities-build-pr/Jenkinsfile | 4 +++- jenkins/common/sonic-utilities-build/Jenkinsfile | 4 +++- jenkins/vs/sonic-swss-build-pr/Jenkinsfile | 4 +++- jenkins/vs/sonic-swss-build/Jenkinsfile | 4 +++- scripts/common/sonic-utilities-build/build.sh | 4 +++- scripts/vs/sonic-swss-build/build.sh | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/jenkins/common/sonic-utilities-build-pr/Jenkinsfile b/jenkins/common/sonic-utilities-build-pr/Jenkinsfile index 482f3727b748..e97aa12dfda3 100644 --- a/jenkins/common/sonic-utilities-build-pr/Jenkinsfile +++ b/jenkins/common/sonic-utilities-build-pr/Jenkinsfile @@ -19,7 +19,9 @@ pipeline { stage('Build') { steps { - sh './scripts/common/sonic-utilities-build/build.sh' + withCredentials([usernamePassword(credentialsId: 'sonicdev-cr', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWD')]) { + sh './scripts/common/sonic-utilities-build/build.sh' + } } } diff --git a/jenkins/common/sonic-utilities-build/Jenkinsfile b/jenkins/common/sonic-utilities-build/Jenkinsfile index 951f59ec464c..1f0e1c8493df 100644 --- a/jenkins/common/sonic-utilities-build/Jenkinsfile +++ b/jenkins/common/sonic-utilities-build/Jenkinsfile @@ -18,7 +18,9 @@ pipeline { stage('Build') { steps { - sh './scripts/common/sonic-utilities-build/build.sh' + withCredentials([usernamePassword(credentialsId: 'sonicdev-cr', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWD')]) { + sh './scripts/common/sonic-utilities-build/build.sh' + } } } diff --git a/jenkins/vs/sonic-swss-build-pr/Jenkinsfile b/jenkins/vs/sonic-swss-build-pr/Jenkinsfile index 811e40aec10a..ac7b1e9fad6e 100644 --- a/jenkins/vs/sonic-swss-build-pr/Jenkinsfile +++ b/jenkins/vs/sonic-swss-build-pr/Jenkinsfile @@ -19,7 +19,9 @@ pipeline { stage('Build') { steps { - sh './scripts/vs/sonic-swss-build/build.sh' + withCredentials([usernamePassword(credentialsId: 'sonicdev-cr', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWD')]) { + sh './scripts/vs/sonic-swss-build/build.sh' + } } } diff --git a/jenkins/vs/sonic-swss-build/Jenkinsfile b/jenkins/vs/sonic-swss-build/Jenkinsfile index 8ad1bab948a4..192dd127f8b6 100644 --- a/jenkins/vs/sonic-swss-build/Jenkinsfile +++ b/jenkins/vs/sonic-swss-build/Jenkinsfile @@ -18,7 +18,9 @@ pipeline { stage('Build') { steps { - sh './scripts/vs/sonic-swss-build/build.sh' + withCredentials([usernamePassword(credentialsId: 'sonicdev-cr', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWD')]) { + sh './scripts/vs/sonic-swss-build/build.sh' + } } } diff --git a/scripts/common/sonic-utilities-build/build.sh b/scripts/common/sonic-utilities-build/build.sh index fb693d7e630d..280adbef5a71 100755 --- a/scripts/common/sonic-utilities-build/build.sh +++ b/scripts/common/sonic-utilities-build/build.sh @@ -25,7 +25,9 @@ EOF chmod 755 build_sonic_utilities.sh # Build sonic-utilities and copy resulting Debian package -docker run --rm=true --privileged -v $(pwd):/sonic -w /sonic -i sonic-slave-stretch-johnar ./build_sonic_utilities.sh +docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWD sonicdev-microsoft.azurecr.io:443 +docker pull sonicdev-microsoft.azurecr.io:443/sonic-slave-stretch:latest +docker run --rm=true --privileged -v $(pwd):/sonic -w /sonic -i sonicdev-microsoft.azurecr.io:443/sonic-slave-stretch:latest ./build_sonic_utilities.sh cp sonic-utilities/deb_dist/python-sonic-utilities_*.deb buildimage/target/python-debs/ diff --git a/scripts/vs/sonic-swss-build/build.sh b/scripts/vs/sonic-swss-build/build.sh index e71d424b44e5..fda60c12e4cb 100755 --- a/scripts/vs/sonic-swss-build/build.sh +++ b/scripts/vs/sonic-swss-build/build.sh @@ -1,3 +1,5 @@ #!/bin/bash -ex -docker run --rm=true --privileged -v $(pwd):/sonic -w /sonic -i sonic-slave-stretch-johnar ./scripts/vs/sonic-swss-build/build_in_docker.sh +docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWD sonicdev-microsoft.azurecr.io:443 +docker pull sonicdev-microsoft.azurecr.io:443/sonic-slave-stretch:latest +docker run --rm=true --privileged -v $(pwd):/sonic -w /sonic -i sonicdev-microsoft.azurecr.io:443/sonic-slave-stretch:latest ./scripts/vs/sonic-swss-build/build_in_docker.sh