tests/avocado: use the new snapshots for testing

The tuxboot images now have a stable snapshot URL so we can enable the
checksums and remove the avocado warnings. We will have to update as
old snapshots retire but that won't be too frequent.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230424092249.58552-3-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2023-04-24 10:22:33 +01:00
parent ec5ffa0056
commit fa6ecc9bc0

View file

@ -77,20 +77,33 @@ class TuxRunBaselineTest(QemuSystemTest):
failure_message='Kernel panic - not syncing', failure_message='Kernel panic - not syncing',
vm=vm) vm=vm)
def fetch_tuxrun_assets(self, dt=None): def fetch_tuxrun_assets(self, csums=None, dt=None):
""" """
Fetch the TuxBoot assets. They are stored in a standard way so we Fetch the TuxBoot assets. They are stored in a standard way so we
use the per-test tags to fetch details. use the per-test tags to fetch details.
""" """
base_url = f"https://storage.tuxboot.com/{self.tuxboot}/" base_url = f"https://storage.tuxboot.com/20230331/{self.tuxboot}/"
kernel_image = self.fetch_asset(base_url + self.image)
disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst") # empty hash if we weren't passed one
csums = {} if csums is None else csums
ksum = csums.get(self.image, None)
isum = csums.get("rootfs.ext4.zst", None)
kernel_image = self.fetch_asset(base_url + self.image,
asset_hash = ksum,
algorithm = "sha256")
disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst",
asset_hash = isum,
algorithm = "sha256")
cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4" cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4"
process.run(cmd) process.run(cmd)
if dt: if dt:
dtb = self.fetch_asset(base_url + dt) dsum = csums.get(dt, None)
dtb = self.fetch_asset(base_url + dt,
asset_hash = dsum,
algorithm = "sha256")
else: else:
dtb = None dtb = None
@ -149,7 +162,9 @@ class TuxRunBaselineTest(QemuSystemTest):
else: else:
self.vm.wait() self.vm.wait()
def common_tuxrun(self, dt=None, def common_tuxrun(self,
csums=None,
dt=None,
drive="virtio-blk-device", drive="virtio-blk-device",
haltmsg="reboot: System halted", haltmsg="reboot: System halted",
console_index=0): console_index=0):
@ -158,7 +173,7 @@ class TuxRunBaselineTest(QemuSystemTest):
special with the command line we can process most things using special with the command line we can process most things using
the tag metadata. the tag metadata.
""" """
(kernel, disk, dtb) = self.fetch_tuxrun_assets(dt) (kernel, disk, dtb) = self.fetch_tuxrun_assets(csums, dt)
self.prepare_run(kernel, disk, drive, dtb, console_index) self.prepare_run(kernel, disk, drive, dtb, console_index)
self.vm.launch() self.vm.launch()
@ -182,7 +197,11 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=console:ttyAMA0 :avocado: tags=console:ttyAMA0
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun() sums = {"Image" :
"ce95a7101a5fecebe0fe630deee6bd97b32ba41bc8754090e9ad8961ea8674c7",
"rootfs.ext4.zst" :
"bbd5ed4b9c7d3f4ca19ba71a323a843c6b585e880115df3b7765769dbd9dd061"}
self.common_tuxrun(csums=sums)
def test_arm64be(self): def test_arm64be(self):
""" """
@ -194,7 +213,11 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=console:ttyAMA0 :avocado: tags=console:ttyAMA0
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun() sums = { "Image" :
"e0df4425eb2cd9ea9a283e808037f805641c65d8fcecc8f6407d8f4f339561b4",
"rootfs.ext4.zst" :
"e6ffd8813c8a335bc15728f2835f90539c84be7f8f5f691a8b01451b47fb4bd7"}
self.common_tuxrun(csums=sums)
def test_armv5(self): def test_armv5(self):
""" """
@ -206,7 +229,15 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=console:ttyAMA0 :avocado: tags=console:ttyAMA0
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="virtio-blk-pci", sums = { "rootfs.ext4.zst" :
"17177afa74e7294da0642861f08c88ca3c836764299a54bf6d1ce276cb9712a5",
"versatile-pb.dtb" :
"0bc0c0b0858cefd3c32b385c0d66d97142ded29472a496f4f490e42fc7615b25",
"zImage" :
"c95af2f27647c12265d75e9df44c22ff5228c59855f54aaa70f41ec2842e3a4d" }
self.common_tuxrun(csums=sums,
drive="virtio-blk-pci",
dt="versatile-pb.dtb") dt="versatile-pb.dtb")
def test_armv7(self): def test_armv7(self):
@ -219,7 +250,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=console:ttyAMA0 :avocado: tags=console:ttyAMA0
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun() sums = { "rootfs.ext4.zst" :
"ab1fbbeaddda1ffdd45c9405a28cd5370c20f23a7cbc809cc90dc9f243a8eb5a",
"zImage" :
"4c7a22e9f15875bec06bd2a29d822496571eb297d4f22694099ffcdb19077572" }
self.common_tuxrun(csums=sums)
def test_armv7be(self): def test_armv7be(self):
""" """
@ -232,7 +268,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=console:ttyAMA0 :avocado: tags=console:ttyAMA0
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun() sums = {"rootfs.ext4.zst" :
"42ed46dd2d59986206c5b1f6cf35eab58fe3fd20c96b41aaa16b32f3f90a9835",
"zImage" :
"7facc62082b57af12015b08f7fdbaf2f123ba07a478367853ae12b219afc9f2f" }
self.common_tuxrun(csums=sums)
def test_i386(self): def test_i386(self):
""" """
@ -243,7 +284,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=image:bzImage :avocado: tags=image:bzImage
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="virtio-blk-pci") sums = {"bzImage" :
"a3e5b32a354729e65910f5a1ffcda7c14a6c12a55e8213fb86e277f1b76ed956",
"rootfs.ext4.zst" :
"f15e66b2bf673a210ec2a4b2e744a80530b36289e04f5388aab812b97f69754a" }
self.common_tuxrun(csums=sums, drive="virtio-blk-pci")
def test_mips32(self): def test_mips32(self):
""" """
@ -256,7 +302,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") sums = { "rootfs.ext4.zst" :
"fc3da0b4c2f38d74c6d705123bb0f633c76ed953128f9d0859378c328a6d11a0",
"vmlinux" :
"bfd2172f8b17fb32970ca0c8c58f59c5a4ca38aa5855d920be3a69b5d16e52f0" }
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
def test_mips32el(self): def test_mips32el(self):
""" """
@ -268,7 +319,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") sums = { "rootfs.ext4.zst" :
"e799768e289fd69209c21f4dacffa11baea7543d5db101e8ce27e3bc2c41d90e",
"vmlinux" :
"8573867c68a8443db8de6d08bb33fb291c189ca2ca671471d3973a3e712096a3" }
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
def test_mips64(self): def test_mips64(self):
""" """
@ -280,7 +336,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") sums = { "rootfs.ext4.zst" :
"69d91eeb04df3d8d172922c6993bb37d4deeb6496def75d8580f6f9de3e431da",
"vmlinux" :
"09010e51e4b8bcbbd2494786ffb48eca78f228e96e5c5438344b0eac4029dc61" }
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
def test_mips64el(self): def test_mips64el(self):
""" """
@ -291,7 +352,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") sums = { "rootfs.ext4.zst" :
"fba585368f5915b1498ed081863474b2d7ec4e97cdd46d21bdcb2f9698f83de4",
"vmlinux" :
"d4e08965e2155c4cccce7c5f34d18fe34c636cda2f2c9844387d614950155266" }
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
def test_ppc32(self): def test_ppc32(self):
""" """
@ -302,7 +368,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=image:uImage :avocado: tags=image:uImage
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="virtio-blk-pci") sums = { "rootfs.ext4.zst" :
"8885b9d999cc24d679542a02e9b6aaf48f718f2050ece6b8347074b6ee41dd09",
"uImage" :
"1a68f74b860fda022fb12e03c5efece8c2b8b590d96cca37a8481a3ae0b3f81f" }
self.common_tuxrun(csums=sums, drive="virtio-blk-pci")
def test_ppc64(self): def test_ppc64(self):
""" """
@ -316,7 +387,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=extradev:driver=spapr-vscsi :avocado: tags=extradev:driver=spapr-vscsi
:avocado: tags=root:sda :avocado: tags=root:sda
""" """
self.common_tuxrun(drive="scsi-hd") sums = { "rootfs.ext4.zst" :
"1d953e81a4379e537fc8e41e05a0a59d9b453eef97aa03d47866c6c45b00bdff",
"vmlinux" :
"f22a9b9e924174a4c199f4c7e5d91a2339fcfe51c6eafd0907dc3e09b64ab728" }
self.common_tuxrun(csums=sums, drive="scsi-hd")
def test_ppc64le(self): def test_ppc64le(self):
""" """
@ -329,7 +405,12 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=extradev:driver=spapr-vscsi :avocado: tags=extradev:driver=spapr-vscsi
:avocado: tags=root:sda :avocado: tags=root:sda
""" """
self.common_tuxrun(drive="scsi-hd") sums = { "rootfs.ext4.zst" :
"b442678c93fb8abe1f7d3bfa20556488de6b475c22c8fed363f42cf81a0a3906",
"vmlinux" :
"979eb61b445a010fb13e2b927126991f8ceef9c590fa2be0996c00e293e80cf2" }
self.common_tuxrun(csums=sums, drive="scsi-hd")
def test_riscv32(self): def test_riscv32(self):
""" """
@ -337,7 +418,14 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=machine:virt :avocado: tags=machine:virt
:avocado: tags=tuxboot:riscv32 :avocado: tags=tuxboot:riscv32
""" """
self.common_tuxrun() sums = { "Image" :
"89599407d7334de629a40e7ad6503c73670359eb5f5ae9d686353a3d6deccbd5",
"fw_jump.elf" :
"f2ef28a0b77826f79d085d3e4aa686f1159b315eff9099a37046b18936676985",
"rootfs.ext4.zst" :
"7168d296d0283238ea73cd5a775b3dd608e55e04c7b92b76ecce31bb13108cba" }
self.common_tuxrun(csums=sums)
def test_riscv64(self): def test_riscv64(self):
""" """
@ -345,7 +433,14 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=machine:virt :avocado: tags=machine:virt
:avocado: tags=tuxboot:riscv64 :avocado: tags=tuxboot:riscv64
""" """
self.common_tuxrun() sums = { "Image" :
"cd634badc65e52fb63465ec99e309c0de0369f0841b7d9486f9729e119bac25e",
"fw_jump.elf" :
"6e3373abcab4305fe151b564a4c71110d833c21f2c0a1753b7935459e36aedcf",
"rootfs.ext4.zst" :
"b18e3a3bdf27be03da0b285e84cb71bf09eca071c3a087b42884b6982ed679eb" }
self.common_tuxrun(csums=sums)
def test_s390(self): def test_s390(self):
""" """
@ -355,7 +450,13 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=image:bzImage :avocado: tags=image:bzImage
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="virtio-blk-ccw", sums = { "bzImage" :
"0414e98dd1c3dafff8496c9cd9c28a5f8d04553bb5ba37e906a812b48d442ef0",
"rootfs.ext4.zst" :
"88c37c32276677f873a25ab9ec6247895b8e3e6f8259134de2a616080b8ab3fc" }
self.common_tuxrun(csums=sums,
drive="virtio-blk-ccw",
haltmsg="Requesting system halt") haltmsg="Requesting system halt")
# Note: some segfaults caused by unaligned userspace access # Note: some segfaults caused by unaligned userspace access
@ -370,9 +471,14 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=console:ttySC1 :avocado: tags=console:ttySC1
""" """
sums = { "rootfs.ext4.zst" :
"3592a7a3d5a641e8b9821449e77bc43c9904a56c30d45da0694349cfd86743fd",
"zImage" :
"29d9b2aba604a0f53a5dc3b5d0f2b8e35d497de1129f8ee5139eb6fdf0db692f" }
# The test is currently too unstable to do much in userspace # The test is currently too unstable to do much in userspace
# so we skip common_tuxrun and do a minimal boot and shutdown. # so we skip common_tuxrun and do a minimal boot and shutdown.
(kernel, disk, dtb) = self.fetch_tuxrun_assets() (kernel, disk, dtb) = self.fetch_tuxrun_assets(csums=sums)
# the console comes on the second serial port # the console comes on the second serial port
self.prepare_run(kernel, disk, self.prepare_run(kernel, disk,
@ -395,7 +501,13 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
sums = { "rootfs.ext4.zst" :
"ad2f1dc436ab51583543d25d2c210cab478645d47078d30d129a66ab0e281d76",
"vmlinux" :
"e34313e4325ff21deaa3d38a502aa09a373ef62b9bd4d7f8f29388b688225c55" }
self.common_tuxrun(csums=sums, drive="driver=ide-hd,bus=ide.0,unit=0")
def test_x86_64(self): def test_x86_64(self):
""" """
@ -407,4 +519,10 @@ class TuxRunBaselineTest(QemuSystemTest):
:avocado: tags=root:sda :avocado: tags=root:sda
:avocado: tags=shutdown:nowait :avocado: tags=shutdown:nowait
""" """
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0") sums = { "bzImage" :
"2bc7480a669ee9b6b82500a236aba0c54233debe98cb968268fa230f52f03461",
"rootfs.ext4.zst" :
"b72ac729769b8f51c6dffb221113c9a063c774dbe1d66af30eb593c4e9999b4b" }
self.common_tuxrun(csums=sums,
drive="driver=ide-hd,bus=ide.0,unit=0")