diff options
| -rw-r--r-- | Jenkinsfile | 10 | ||||
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch | 28 |
3 files changed, 29 insertions, 11 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 07deb126..319f748c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,6 @@ pipeline { booleanParam(name: 'BUILD_PUBLISH', defaultValue: true, description: 'Publish this build to downloads.vyos.io and AWS S3') booleanParam(name: 'BUILD_SMOKETESTS', defaultValue: true, description: 'Include Smoketests in ISO image') booleanParam(name: 'BUILD_SNAPSHOT', defaultValue: false, description: 'Upload image to AWS S3 snapshot bucket') - booleanParam(name: 'BUILD_QEMU', defaultValue: false, description: 'Generate QEMU image') } triggers { cron('H 2 * * *') @@ -130,15 +129,6 @@ pipeline { } } } - stage('Build QEMU image') { - when { - expression { fileExists 'build/live-image-amd64.hybrid.iso' } - expression { return params.BUILD_QEMU } - } - steps { - sh "sudo make qemu" - } - } } post { success { diff --git a/data/defaults.json b/data/defaults.json index 77f57478..22cbcae4 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "bullseye", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "5.10.47", + "kernel_version": "5.10.48", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "additional_repositories": [ diff --git a/packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch b/packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch new file mode 100644 index 00000000..3d51e8de --- /dev/null +++ b/packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch @@ -0,0 +1,28 @@ +From a1019153294df7093c11dd7fc5b998c0b3a75085 Mon Sep 17 00:00:00 2001 +From: Emanuele Di Pascale <emanuele@voltanet.io> +Date: Tue, 22 Dec 2020 18:20:14 +0100 +Subject: [PATCH] tools: add bfdd to frr-reload.py daemons list + +Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io> +Signed-off-by: Christian Poessinger <christian@poessinger.com> + +(cherry picked from commit ee96c52a2828335c698c27ee7f7374204a97d4cb) +--- + tools/frr-reload.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/frr-reload.py b/tools/frr-reload.py +index 9f37d44aa..a3aed7719 100755 +--- a/tools/frr-reload.py ++++ b/tools/frr-reload.py +@@ -1388,7 +1388,7 @@ if __name__ == '__main__': + sys.exit(1) + + # verify that the daemon, if specified, is valid +- if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd']: ++ if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd', 'bfdd']: + log.error("Daemon %s is not a valid option for 'show running-config'" % args.daemon) + sys.exit(1) + +-- +2.20.1 |