vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

CI/CD: extend error reporting for Jenkins builds

Browse Source
This commit is contained in:
Christian Poessinger 2019-01-06 11:29:44 +01:00
parent 3bd3fda4c0
commit d0d363186d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -145,14 +145,10 @@ pipeline {
sh 'scripts/build-submodules' sh 'scripts/build-submodules'
} }
} }
stage('Show Dir') { stage('Build ISO') {
steps { steps {
sh 'ls -al' sh 'ls -al'
sh 'ls -al packages' sh 'ls -al packages'
}
}
stage('Build ISO') {
steps {
sh 'sudo make iso' sh 'sudo make iso'
} }
} }

5
scripts/build-submodules
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
#set -x
if [ ! -d "packages" ]; then if [ ! -d "packages" ]; then
echo "This script needs to be executed inside the top root of vyos-build" echo "This script needs to be executed inside the top root of vyos-build"
exit 1 exit 1
@ -112,6 +112,7 @@ if [ -f "packages/vyos-kernel/Makefile" ]; then
bash -c '../../scripts/build-kernel' >$PKGDIR/vyos-kernel.buildlog 2>&1 bash -c '../../scripts/build-kernel' >$PKGDIR/vyos-kernel.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
cat $PKGDIR/vyos-kernel.buildlog
error_msg "Failed to build package vyos-kernel, look in vyos-kernel.buildlog to examine the fault\n" error_msg "Failed to build package vyos-kernel, look in vyos-kernel.buildlog to examine the fault\n"
else else
VERSION=$(grep "^VERSION" Makefile | grep -Eo '[0-9]{1,4}') VERSION=$(grep "^VERSION" Makefile | grep -Eo '[0-9]{1,4}')
@ -142,6 +143,7 @@ if [ -d "packages/vyos-wireguard/debian" ]; then
bash -c 'KERNELDIR=/vyos/packages/vyos-kernel dpkg-buildpackage -uc -us -tc -b' >$PKGDIR/vyos-wireguard.buildlog 2>&1 bash -c 'KERNELDIR=/vyos/packages/vyos-kernel dpkg-buildpackage -uc -us -tc -b' >$PKGDIR/vyos-wireguard.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
cat $PKGDIR/vyos-wireguard.buildlog
error_msg "Failed to build package vyos-wireguard, look in vyos-wireguard.buildlog to examine the fault\n" error_msg "Failed to build package vyos-wireguard, look in vyos-wireguard.buildlog to examine the fault\n"
else else
status_ok status_ok
@ -175,6 +177,7 @@ if [ -d "packages/vyos-accel-ppp/debian" ]; then
KERNELDIR=$PKGDIR/vyos-kernel dpkg-buildpackage -uc -us -tc -b >$PKGDIR/vyos-accel-ppp.buildlog 2>&1 KERNELDIR=$PKGDIR/vyos-kernel dpkg-buildpackage -uc -us -tc -b >$PKGDIR/vyos-accel-ppp.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
cat $PKGDIR/vyos-accel-ppp.buildlog
error_msg "Failed to build package vyos-accel-ppp, look in vyos-accel-ppp.buildlog to examine the fault\n" error_msg "Failed to build package vyos-accel-ppp, look in vyos-accel-ppp.buildlog to examine the fault\n"
else else
status_ok status_ok