diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-22 20:44:56 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-01-22 20:44:56 +0100 |
| commit | f5887de05ea4d8ec12eca4c1a382f8f39d0de7ad (patch) | |
| tree | 1ba3ca1173264fbd1ac7013a5bec01ed6411aace | |
| parent | c1b5494ea099f4c4ced3fe96d847b720e7e2494f (diff) | |
| download | vyos-build-f5887de05ea4d8ec12eca4c1a382f8f39d0de7ad.tar.gz vyos-build-f5887de05ea4d8ec12eca4c1a382f8f39d0de7ad.zip | |
Testsuite: T7043: make build/manifest.json optional
Support loading and testing random ISO images without the need for
build/manifest.json. If the file is detected - tests are run. If file is
not found - those tests are skipped.
| -rwxr-xr-x | scripts/check-qemu-install | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 5a59f13c..b7b009b2 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -105,11 +105,13 @@ with open('data/defaults.toml', 'rb') as f: vyos_defaults = tomli.load(f) # This is what we got from the build -with open('build/manifest.json', 'rb') as f: - manifest = json.load(f) +manifest_file = 'build/manifest.json' +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_codename = manifest['build_config']['release_train'] + vyos_version = manifest['build_config']['version'] + vyos_codename = manifest['build_config']['release_train'] class StreamToLogger(object): """ @@ -558,10 +560,11 @@ try: ################################################# c.sendline('lsb_release --short --id 2>/dev/null') c.expect('VyOS') - c.sendline('lsb_release --short --release 2>/dev/null') - c.expect(vyos_version) - c.sendline('lsb_release --short --codename 2>/dev/null') - c.expect(vyos_codename) + if os.path.isfile(manifest_file): + c.sendline('lsb_release --short --release 2>/dev/null') + c.expect(vyos_version) + c.sendline('lsb_release --short --codename 2>/dev/null') + c.expect(vyos_codename) # Ensure ephemeral key is loaded vyos_kernel_key = 'VyOS build time autogenerated kernel key' |