@@ -42,13 +42,13 @@ touch target/debs/stretch/*.deb
42
42
43
43
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
44
44
45
- make SONIC_CONFIG_BUILD_JOBS=1 $CACHE_OPTIONS target/sonic-vs.img.gz
45
+ make SONIC_CONFIG_BUILD_JOBS=1 $CACHE_OPTIONS target/sonic-vs.bin
46
46
47
47
rm -rf ../target
48
48
mv target ../
49
49
50
50
# copy image to scratchpad
51
- sudo cp ../target/sonic-vs.img.gz /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUMBER}.img.gz
51
+ sudo cp ../target/sonic-vs.bin /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUMBER}.bin
52
52
'''
53
53
}
54
54
}
@@ -63,10 +63,24 @@ sudo cp ../target/sonic-vs.img.gz /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_
63
63
userRemoteConfigs : [[url : ' https://github.com/Azure/sonic-mgmt' ]]])
64
64
}
65
65
66
+ dir(' sonic-buildimage' ) {
67
+ checkout([$class : ' GitSCM' ,
68
+ branches : [[name : ' ${sha1}' ]],
69
+ extensions : [[$class : ' SubmoduleOption' ,
70
+ disableSubmodules : false ,
71
+ parentCredentials : false ,
72
+ recursiveSubmodules : false ,
73
+ reference : ' ' ,
74
+ trackingSubmodules : false ]],
75
+ userRemoteConfigs : [[url : ' http://github.com/Azure/sonic-buildimage' ,
76
+ refspec : ' +refs/pull/*:refs/remotes/origin/pr/*' ]]])
77
+ }
78
+
66
79
wrap([$class : ' AnsiColorBuildWrapper' , ' colorMapName' : ' xterm' ]) {
67
80
lock(resource : " kvmtest_${ env.NODE_NAME} " ) {
68
81
withCredentials([sshUserPrivateKey(credentialsId : ' 2b6b6afe-4892-41d1-967c-d683e7773727' , keyFileVariable : ' PRIVATE_KEY' ), \
69
82
usernamePassword(credentialsId : ' sonicdev-cr' , usernameVariable : ' REGISTRY_USERNAME' , passwordVariable : ' REGISTRY_PASSWD' )]) {
83
+ sh ' ./scripts/vs/buildimage-vs-image/build_kvm_image.sh'
70
84
sh ' ./scripts/vs/buildimage-vs-image/test.sh'
71
85
}
72
86
}
@@ -76,7 +90,7 @@ sudo cp ../target/sonic-vs.img.gz /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_
76
90
post {
77
91
always {
78
92
junit(allowEmptyResults : true , keepLongStdio : true , testResults : ' sonic-mgmt/tests/results/**/*.xml' )
79
- archiveArtifacts(artifacts : ' sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**' )
93
+ archiveArtifacts(artifacts : ' target/**, sonic-mgmt/tests/results/**, sonic-mgmt/tests/logs/**' )
80
94
}
81
95
}
82
96
}
0 commit comments