[jenkins]: pull sonic-slave-stretch docker from reg for swss and util…

…ities build (#52) Signed-off-by: Shu0T1an ChenG <[email protected]>
xumia · Jul 27, 2019 · 934173d · 934173d
1 parent 8191332
commit 934173d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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