Merge autopkgtest-cloud:arm64-only-qemu-efi-noacpi into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Merge reported by: Brian Murray
Merged at revision: c9b3206f2c13a599b42eb6561ea4da187dc58779
Proposed branch: autopkgtest-cloud:arm64-only-qemu-efi-noacpi
Merge into: autopkgtest-cloud:master
Diff against target: 43 lines (+18/-3)
2 files modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker (+16/-1)
docs/administration.rst (+2/-2)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Ubuntu Release Team Pending
Review via email: mp+431384@code.launchpad.net

Description of the change

We were seeing autopkgtest failures on armhf with the following in the logs:

No such directory: /boot/efi/EFI

The actual package being tested was fwts with the trigger "linux-meta-raspi/5.19.0.1002.4 qemu-efi-noacpi/0" and it was the qemu-efi-noacpi trigger which aborts if /boot/efi/EFI does not exist. We don't think the trigger should run on anything besides arm64 so want to prevent the test from running.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This change has been cowboy'ed and we can see the results here https://autopkgtest.ubuntu.com/packages/fwts/kinetic/armhf

Revision history for this message
Paride Legovini (paride) wrote :

This looks good, thanks for the fixups. Maybe we should add a

  logging.warning('...')

in the else stanza, otherwise I think this will won't be very visible from the service logs, which can help us debugging.

Another more general comment: there is some code duplication now, basically all the 'else' stanza is the same of the "never_run" check. Should we need to add another instance of this "don't run test but fake exit code and log file" code let's remember to factor it out in a separate function or similar.

review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

I'm not happy with how we see "trigger:" in the Version table at https://autopkgtest.ubuntu.com/packages/fwts/kinetic/armhf .

Revision history for this message
Brian Murray (brian-murray) wrote :

> I'm not happy with how we see "trigger:" in the Version table at
> https://autopkgtest.ubuntu.com/packages/fwts/kinetic/armhf .

However, it might be because the cowboy'ed version of the change is different.

Revision history for this message
Paride Legovini (paride) wrote :

Should we go ahead and merge this?

c9b3206... by Brian Murray

Clarify where seed-new-release is located.

Revision history for this message
Paride Legovini (paride) wrote :

Looks like there's an extra unrelated commit in the proposed branch now?

review: Needs Information
Revision history for this message
Paride Legovini (paride) wrote :

Merging this as discussed in side channel (adt-153).

review: Approve
Revision history for this message
Paride Legovini (paride) wrote :

This is merged but not automatically marked as merged by LP as I had to manually get rid of the spurious commit (c9b3206).

I can't manually change the MP status to merged.
@Brian can you please do so?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
2index 8a05766..77d0ebe 100755
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
5@@ -587,7 +587,22 @@ def request(msg):
6 argv += ['--setup-commands', c]
7
8 if 'triggers' in params and 'qemu-efi-noacpi/0' in params['triggers']:
9- argv += ['--setup-commands', '/home/ubuntu/autopkgtest-cloud/worker-config-production/qemu-efi-noacpi.sh']
10+ if architecture == 'arm64':
11+ argv += ['--setup-commands', '/home/ubuntu/autopkgtest-cloud/worker-config-production/qemu-efi-noacpi.sh']
12+ else:
13+ # these will be written later on
14+ code = 99
15+ duration = 0
16+
17+ os.makedirs(out_dir)
18+ # fake a log file
19+ with open(os.path.join(out_dir, 'log'), 'w') as log:
20+ log.write('Not running due to invalid trigger: qemu-efi-noacpi/0 is arm64 only')
21+ dont_run = True
22+
23+ # and the testpackage version (invalid trigger with a reason)
24+ with open(os.path.join(out_dir, 'testpkg-version'), 'w') as testpkg_version:
25+ testpkg_version.write('invalid trigger: qemu-efi-noacpi/0 is arm64 only')
26
27 if 'ppas' in params and params['ppas']:
28 for ppa in params['ppas']:
29diff --git a/docs/administration.rst b/docs/administration.rst
30index 4e25997..997bfa1 100644
31--- a/docs/administration.rst
32+++ b/docs/administration.rst
33@@ -144,8 +144,8 @@ Opening up a new series
34
35 * Download the latest ``autopkgtest.db`` from the website/unit to the home
36 directory on wendigo
37-* Run ``seed-new-release <old_release> <new_release> autopkgtest.db`` on
38- wendigo.
39+* Run ``autopkgtest-cloud/tools/seed-new-release <old_release> <new_release> autopkgtest.db``
40+ on wendigo.
41 * Update the ``service-bundle`` to include the release in ``releases`` and
42 deploy it. Run ``systemctl start download-all-results.service`` to download
43 the results from swift to the db. TODO: This should be done automatically

Subscribers

People subscribed via source and target branches