diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | packages/iproute2/Jenkinsfile | 6 | ||||
| m--------- | packages/iproute2/iproute2 | 0 | ||||
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 8 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 12 |
5 files changed, 20 insertions, 8 deletions
diff --git a/data/defaults.json b/data/defaults.json index 4e137ec7..06332d34 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "5.10.10", + "kernel_version": "5.10.12", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "additional_repositories": [ diff --git a/packages/iproute2/Jenkinsfile b/packages/iproute2/Jenkinsfile index 4844c8f7..88363ead 100644 --- a/packages/iproute2/Jenkinsfile +++ b/packages/iproute2/Jenkinsfile @@ -20,11 +20,13 @@ // @Library annotation is not an import statement! @Library('vyos-build@current')_ +// NOTE: we can build with -d as the libbpf dependency is installed manually +// and not via a DEB package def pkgList = [ ['name': 'iproute2', - 'scmCommit': 'debian/5.4.0-1_bpo10+1', + 'scmCommit': 'debian/5.10.0-3', 'scmUrl': 'https://salsa.debian.org/debian/iproute2', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], + 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b -d'], ] // Start package build using library function from https://github.com/vyos/vyos-build diff --git a/packages/iproute2/iproute2 b/packages/iproute2/iproute2 deleted file mode 160000 -Subproject ae0b22e5a74391df3d6064f2f57ed31e222180b diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index fffe35a4..c34b9d6a 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -70,7 +70,6 @@ pipeline { steps { script { checkout scm - echo env.CHANGESET_DIR } } } @@ -82,6 +81,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -111,6 +111,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -132,6 +133,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -154,6 +156,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -173,6 +176,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -189,6 +193,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } @@ -210,6 +215,7 @@ pipeline { beforeAgent true anyOf { changeset pattern: "${env.CHANGESET_DIR}" + changeset pattern: "**/data/defaults.json" triggeredBy 'TimerTrigger' triggeredBy cause: "UserIdCause" } diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index b28c000f..ead8ed10 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -371,10 +371,14 @@ try: c.expect(r'vyos@vyos:~\$', timeout=600) c.sendline(f'openssl dhparam -out {dh_pem} 2048') c.expect(r'vyos@vyos:~\$', timeout=600) - c.sendline(f'openvpn --genkey --secret {s2s_key}') - c.expect(r'vyos@vyos:~\$', timeout=600) - c.sendline(f'openvpn --genkey --secret {auth_key}') - c.expect(r'vyos@vyos:~\$', timeout=600) + c.sendline(f'generate openvpn key {s2s_key}') + c.expect(r'vyos@vyos:~\$') + c.sendline(f'generate openvpn key {auth_key}') + c.expect(r'vyos@vyos:~\$') + + script_file = '/config/scripts/vyos-foo-update.script' + c.sendline(f'echo "#!/bin/sh" > {script_file}; chmod 775 {script_file}') + c.expect(r'vyos@vyos:~\$') for file in [ca_cert, ssl_cert, ssl_key, dh_pem, s2s_key, auth_key]: c.sendline(f'sudo chown openvpn:openvpn {file}') |