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

Merge pull request #892 from c-po/optional-lsb-tests

Browse Source 
Testsuite: T7043: make build/manifest.json optional
This commit is contained in:
Daniil Baturin 2025-01-23 17:08:12 +00:00 committed by GitHub
commit 16f9226b1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/check-qemu-install
View File

@ -105,11 +105,13 @@ with open('data/defaults.toml', 'rb') as f:
vyos_defaults = tomli.load(f) vyos_defaults = tomli.load(f)
# This is what we got from the build # This is what we got from the build
with open('build/manifest.json', 'rb') as f: manifest_file = 'build/manifest.json'
manifest = json.load(f) if os.path.isfile(manifest_file):
with open('build/manifest.json', 'rb') as f:
manifest = json.load(f)
vyos_version = manifest['build_config']['version'] vyos_version = manifest['build_config']['version']
vyos_codename = manifest['build_config']['release_train'] vyos_codename = manifest['build_config']['release_train']
class StreamToLogger(object): class StreamToLogger(object):
""" """
@ -558,10 +560,11 @@ try:
################################################# #################################################
c.sendline('lsb_release --short --id 2>/dev/null') c.sendline('lsb_release --short --id 2>/dev/null')
c.expect('VyOS') c.expect('VyOS')
c.sendline('lsb_release --short --release 2>/dev/null') if os.path.isfile(manifest_file):
c.expect(vyos_version) c.sendline('lsb_release --short --release 2>/dev/null')
c.sendline('lsb_release --short --codename 2>/dev/null') c.expect(vyos_version)
c.expect(vyos_codename) c.sendline('lsb_release --short --codename 2>/dev/null')
c.expect(vyos_codename)
# Ensure ephemeral key is loaded # Ensure ephemeral key is loaded
vyos_kernel_key = 'VyOS build time autogenerated kernel key' vyos_kernel_key = 'VyOS build time autogenerated kernel key'