diff options
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | data/defaults.json | 4 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/80-delete-docs.chroot | 6 | ||||
| -rw-r--r-- | data/package-lists/vyos-utils.list.chroot | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 42 | ||||
| -rw-r--r-- | packages/frr/Jenkinsfile | 7 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 15 | ||||
| -rwxr-xr-x | scripts/live-build-config | 2 |
9 files changed, 61 insertions, 19 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 405b6c7b..0e8ca036 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,7 +65,7 @@ pipeline { } options { disableConcurrentBuilds() - timeout(time: 180, unit: 'MINUTES') + timeout(time: 240, unit: 'MINUTES') timestamps() buildDiscarder(logRotator(numToKeepStr: '20')) } diff --git a/data/defaults.json b/data/defaults.json index 792a20a2..a8443204 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,12 +5,12 @@ "debian_distribution": "bullseye", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "5.10.109", + "kernel_version": "5.10.117", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "bootloaders": "syslinux,grub-efi", "additional_repositories": [ - "deb [arch=amd64] https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main", + "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main", "deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-45 main", "deb [arch=amd64] https://repos.influxdata.com/debian bullseye stable" ], diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 6fdf3565..fbe2abde 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -9,6 +9,7 @@ systemctl disable pmacctd.service systemctl disable sfacctd.service systemctl disable uacctd.service systemctl disable ssh.service +systemctl disable sshguard.service systemctl disable openvpn.service systemctl disable lldpd.service systemctl disable LCDd.service diff --git a/data/live-build-config/hooks/live/80-delete-docs.chroot b/data/live-build-config/hooks/live/80-delete-docs.chroot index d08b8edd..fa1f5168 100755 --- a/data/live-build-config/hooks/live/80-delete-docs.chroot +++ b/data/live-build-config/hooks/live/80-delete-docs.chroot @@ -1,4 +1,6 @@ #!/bin/bash -# We do not need any documentation on the system. This frees 43MB. -rm -rf /usr/share/doc /usr/share/doc-base /usr/share/docutils +# We do not need any documentation on the system. This frees some space. +# Copyright/licenses files are ignored for deletion +shopt -s extglob +rm -rf /usr/share/doc/*/!(copyright) /usr/share/doc-base diff --git a/data/package-lists/vyos-utils.list.chroot b/data/package-lists/vyos-utils.list.chroot deleted file mode 100644 index c123a826..00000000 --- a/data/package-lists/vyos-utils.list.chroot +++ /dev/null @@ -1 +0,0 @@ -sipcalc diff --git a/docker/Dockerfile b/docker/Dockerfile index 2b81d513..f361875c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -254,16 +254,14 @@ RUN apt-get update && apt-get install -y \ libssh-dev \ doxygen -# Build rtrlib release 0.7.0 -RUN export RTRLIB_VERSION="56e67e7805953eb84d3d68dfb4ff4447f2a8c925" \ - export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \ - wget -P /tmp https://github.com/rtrlib/rtrlib/archive/${RTRLIB_VERSION}.tar.gz && \ - tar xf /tmp/${RTRLIB_VERSION}.tar.gz -C /tmp && \ - cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ +# Build rtrlib release 0.8.0 +RUN export RTRLIB_VERSION="0.8.0" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \ + git clone https://github.com/rtrlib/rtrlib.git /tmp/rtrlib && cd /tmp/rtrlib && \ + dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb # Packages needed to build libyang2 -RUN pip3 install apkg +RUN pip install apkg RUN apt-get update && apt-get install -y \ graphviz \ cmake \ @@ -278,6 +276,9 @@ RUN export LIBYANG_COMMIT="v2.0.164" && \ cd libyang && git checkout $LIBYANG_COMMIT && apkg build -i && \ cd pkg/pkgs/debian-11/libyang2_* && dpkg -i *.deb +# FRR documentation also has a dependency on an up to date spinx version +RUN pip install sphinx==4.0.2 + # Packages needed to build FRR itself # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst # for more info @@ -304,7 +305,6 @@ RUN apt-get update && apt-get install -y \ python3 \ python3-dev \ python3-pytest \ - python3-sphinx \ texinfo # Packages needed for hvinfo @@ -313,6 +313,7 @@ RUN apt-get update && apt-get install -y \ gprbuild # Packages needed for vyos-1x +RUN pip install git+https://github.com/aristanetworks/j2lint.git@341b5d5db86 RUN apt-get update && apt-get install -y \ dh-python \ fakeroot \ @@ -518,6 +519,31 @@ RUN apt-get update && apt-get install -y \ udev \ zip +# Packages needed for Fastnetmon +RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ + apt-get update && apt-get install -y \ + build-essential \ + make \ + autoconf \ + automake \ + libtool \ + cmake \ + pkg-config \ + capnproto \ + libcapnp-dev \ + libgrpc++-dev \ + libgrpc-dev \ + libgrpc10 \ + libprotobuf-dev \ + protobuf-compiler \ + protobuf-compiler-grpc \ + libboost-thread1.74-dev \ + libboost-regex1.74-dev \ + libboost-program-options1.74-dev \ + libmongoc-dev \ + liblog4cpp5-dev; \ + fi + # # fpm: a command-line program designed to help you build packages (e.g. deb) # diff --git a/packages/frr/Jenkinsfile b/packages/frr/Jenkinsfile index 2005ea39..40cfa425 100644 --- a/packages/frr/Jenkinsfile +++ b/packages/frr/Jenkinsfile @@ -25,9 +25,12 @@ def pkgList = [ 'scmCommit': 'v2.0.164', 'scmUrl': 'https://github.com/CESNET/libyang.git', 'buildCmd': 'apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} +'], - + ['name': 'rtrlib', + 'scmCommit': 'v0.8.0', + 'scmUrl': 'https://github.com/rtrlib/rtrlib.git', + 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], ['name': 'frr', - 'scmCommit': 'stable/8.2', + 'scmCommit': '56694ea7d5ceae3e0cb54f8b4d15fa73c41b53b6', 'scmUrl': 'https://github.com/FRRouting/frr.git', 'buildCmd': 'cd ..; ./build-frr.sh'], ] diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index aaac8250..96587ce5 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -72,6 +72,9 @@ parser.add_argument('--no-interfaces', help='Execute testsuite without interface action='store_true', default=False) parser.add_argument('--configtest', help='Execute load/commit config tests', action='store_true', default=False) +parser.add_argument('--qemu-cmd', help='Only generate QEMU launch command', + action='store_true', default=False) + args = parser.parse_args() @@ -143,7 +146,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non -smp sockets=1,cpus={cpucount},cores=1 \ -cpu host \ {uefi} \ - -m 1G \ + -m 2G \ -vga none \ -nographic \ -machine accel=kvm \ @@ -151,7 +154,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non {cpu} \ {cdrom} \ {kvm} \ - -netdev user,id=n0 -device virtio-net-pci,netdev=n0,mac={macbase}:00,romfile="" \ + -netdev user,id=n0,net=192.0.2.0/24,dhcpstart=192.0.2.101,dns=192.0.2.10 -device virtio-net-pci,netdev=n0,mac={macbase}:00,romfile="" \ -netdev user,id=n1 -device virtio-net-pci,netdev=n1,mac={macbase}:01,romfile="" \ -netdev user,id=n2 -device virtio-net-pci,netdev=n2,mac={macbase}:02,romfile="" \ -netdev user,id=n3 -device virtio-net-pci,netdev=n3,mac={macbase}:03,romfile="" \ @@ -262,6 +265,11 @@ if args.raid: # must be called after the raid disk as args.disk name is altered in the RAID path gen_disk(args.disk) +if args.qemu_cmd: + tmp = get_qemu_cmd('TESTVM', kvm, args.uefi, args.disk, diskname_raid, args.iso) + print(tmp) + exit(0) + test_timeout = 3 *3600 # 3 hours (in seconds) try: ################################################# @@ -389,6 +397,9 @@ try: c.expect(op_mode_prompt) c.sendline('show interfaces') c.expect(op_mode_prompt) + c.sendline('systemd-detect-virt') + c.expect('kvm') + c.expect(op_mode_prompt) ################################################# # Executing test-suite diff --git a/scripts/live-build-config b/scripts/live-build-config index 1813e608..a797a32c 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -58,7 +58,7 @@ lb config noauto \ --firmware-binary false \ --updates true \ --security false \ - --backports false \ + --backports true \ --utc-time true \ --debug \ --apt-recommends false \ |