[jenkins]: use sonic-slave-buster to build mgmt-framework

Azure · May 21, 2020 · 28d742b · 28d742b
1 parent 4c892bd
commit 28d742b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/jenkins/common/sonic-mgmt-framework-build-pr/Jenkinsfile b/jenkins/common/sonic-mgmt-framework-build-pr/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'sonic-slave' } }
+    agent { node { label 'sonic-slave-buster' } }
 
     stages {
         stage('Prepare') {

diff --git a/jenkins/common/sonic-mgmt-framework-build/Jenkinsfile b/jenkins/common/sonic-mgmt-framework-build/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-    agent { node { label 'sonic-slave' } }
+    agent { node { label 'sonic-slave-buster' } }
 
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10'))
@@ -21,7 +21,7 @@ pipeline {
                           branches: [[name: 'refs/heads/master']],
                           userRemoteConfigs: [[url: 'http://github.com/Azure/sonic-mgmt-framework']]])
                 }
-                copyArtifacts(projectName: '../vs/buildimage-vs-all', filter: '**/*.deb', target: 'buildimage', flatten: false)
+                copyArtifacts(projectName: '../vs/buildimage-vs-image', filter: '**/*.deb', target: 'buildimage', flatten: false)
             }
         }
 

diff --git a/scripts/common/sonic-mgmt-framework-build/build.sh b/scripts/common/sonic-mgmt-framework-build/build.sh
@@ -1,19 +1,21 @@
 #!/bin/bash -ex
 
+DISTRO=buster
+
 # Install HIREDIS
-sudo dpkg -i buildimage/target/debs/stretch/libhiredis*.deb
+sudo dpkg -i target/debs/${DISTRO}/libhiredis*.deb
 
 # Install REDIS
 sudo apt-get install -y liblua5.1-0 lua-bitop lua-cjson
-sudo dpkg -i buildimage/target/debs/stretch/redis-tools_*.deb
-sudo dpkg -i buildimage/target/debs/stretch/redis-server_*.deb
+sudo dpkg -i target/debs/${DISTRO}/redis-tools_*.deb
+sudo dpkg -i target/debs/${DISTRO}/redis-server_*.deb
 sudo sed -ri 's/^# unixsocket/unixsocket/' /etc/redis/redis.conf
 sudo sed -ri 's/^unixsocketperm .../unixsocketperm 777/' /etc/redis/redis.conf
 sudo sed -ri 's/redis-server.sock/redis.sock/' /etc/redis/redis.conf
 sudo service redis-server start
 
 #Install libyang
-sudo dpkg -i buildimage/target/debs/stretch/libyang*.deb
+sudo dpkg -i target/debs/${DISTRO}/libyang*.deb
 
 pushd sonic-mgmt-framework