diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 2 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/data/defaults.json b/data/defaults.json index 141d31f5..d15765a0 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.81", + "kernel_version": "5.10.82", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "bootloaders": "syslinux,grub-efi", diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index d0e16fc6..99d8e667 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -49,7 +49,7 @@ def pkgList = [ 'buildCmd': 'cd ..; ./build-linux-firmware.sh'], // Accel-PPP - ['name': 'accel-ppp', 'scmCommit': 'aa9e2eefe4ad51', + ['name': 'accel-ppp', 'scmCommit': '51bd8165bb335a', 'scmUrl': 'https://github.com/accel-ppp/accel-ppp.git', 'buildCmd': 'cd ..; pwd; ls -al; ./build-accel-ppp.sh'], diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index a2a7f054..87a34afd 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -203,6 +203,7 @@ if not os.path.isfile(args.disk): else: log.info('Diskimage already exists, using the existing one') +test_timeout = 7200 # seconds try: ################################################# # Installing image to disk @@ -356,7 +357,7 @@ try: log.info('Executing VyOS smoketests') c.sendline('/usr/bin/vyos-smoketest') i = c.expect(['\n +Invalid command:', '\n +Set failed', - 'No such file or directory', r'\n\S+@\S+[$#]'], timeout=7200) + 'No such file or directory', r'\n\S+@\S+[$#]'], timeout=test_timeout) if i == 0: raise Exception('Invalid command detected') @@ -419,7 +420,7 @@ try: log.info('Executing load config tests') c.sendline('/usr/bin/vyos-configtest') i = c.expect(['\n +Invalid command:', 'No such file or directory', - r'\n\S+@\S+[$#]'], timeout=3600) + r'\n\S+@\S+[$#]'], timeout=test_timeout) if i==0: raise Exception('Invalid command detected') |