Skip to content

Commit 62ab26e

Browse files
committed
[vsimage]: build kvm image in jenkins-vstest-workers
1 parent 987b623 commit 62ab26e

File tree

2 files changed

+37
-3
lines changed

2 files changed

+37
-3
lines changed

jenkins/vs/buildimage-vs-image-pr/Jenkinsfile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ touch target/debs/stretch/*.deb
4242
4343
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
4444
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
4646
4747
rm -rf ../target
4848
mv target ../
4949
5050
# 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
5252
'''
5353
}
5454
}
@@ -63,10 +63,24 @@ sudo cp ../target/sonic-vs.img.gz /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_
6363
userRemoteConfigs: [[url: 'https://github.com/Azure/sonic-mgmt']]])
6464
}
6565

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+
6679
wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
6780
lock(resource: "kvmtest_${env.NODE_NAME}") {
6881
withCredentials([sshUserPrivateKey(credentialsId: '2b6b6afe-4892-41d1-967c-d683e7773727', keyFileVariable: 'PRIVATE_KEY'), \
6982
usernamePassword(credentialsId: 'sonicdev-cr', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWD')]) {
83+
sh './scripts/vs/buildimage-vs-image/build_kvm_image.sh'
7084
sh './scripts/vs/buildimage-vs-image/test.sh'
7185
}
7286
}
@@ -76,7 +90,7 @@ sudo cp ../target/sonic-vs.img.gz /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_
7690
post {
7791
always {
7892
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/**')
8094
}
8195
}
8296
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash -xe
2+
3+
echo ${JOB_NAME##*/}.${BUILD_NUMBER}
4+
5+
ls -l
6+
7+
docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWD sonicdev-microsoft.azurecr.io:443
8+
docker pull sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-johnar:latest
9+
10+
cd sonic-buildimage
11+
mkdir -p target
12+
sudo cp /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUMBER}.bin target/sonic-vs.bin
13+
sudo rm /nfs/jenkins/sonic-vs-${JOB_NAME##*/}.${BUILD_NUMBER}.bin
14+
wget -O onie.iso "https://sonicstorage.blob.core.windows.net/packages/onie/onie-recovery-x86_64-kvm_x86_64-r0.iso?sv=2015-04-05&sr=b&sig=XMAk1cttBFM369CMbihe5oZgXwe4uaDVfwg4CTLT%2F5U%3D&se=2155-10-13T10%3A40%3A13Z&sp=r"
15+
16+
docker run --rm=true --privileged -v $(pwd):/data -w /data -i sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-johnar bash -c "SONIC_USERNAME=admin PASSWD=YourPaSsWoRd sudo -E ./scripts/build_kvm_image.sh target/sonic-vs.img onie.iso target/sonic-vs.bin 16"
17+
18+
gzip target/sonic-vs.img
19+
20+
mv target ../

0 commit comments

Comments
 (0)