Skip to content

Commit

Permalink
[cirrus] Start testing on new devel ubuntu daily
Browse files Browse the repository at this point in the history
Ubuntu 24.10 release cycle has new started with the daily builds, so
we start testing on these to uncover any issues

Also update to latest GCE images for any new ubuntu images

Fix the `msr` predicate, such that it is caught on 24.04 and newer
releases of ubuntu

Related: #3610

Signed-off-by: Arif Ali <arif.ali@canonical.com>
  • Loading branch information
arif-ali authored and TurboTurtle committed May 8, 2024
1 parent 1835cf8 commit 01108d4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .cirrus.yml
Expand Up @@ -34,11 +34,11 @@ env:
UBUNTU_DEB_IMAGE_NAME: "ubuntu-minimal-2404-noble-amd64-v20240423"
UBUNTU_LATEST_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20240423"
UBUNTU_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20240423"
UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2204-jammy-v20240319"
UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20240307b"
UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2204-jammy-v20240501"
UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20240426"
UBUNTU_PRIOR3_IMAGE_NAME: "ubuntu-1804-bionic-v20240116a"
UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2204-jammy-v20240319"
UBUNTU_DEVEL_FAMILY_NAME: "ubuntu-2404-lts-amd64"
UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2204-jammy-v20240501"
UBUNTU_DEVEL_FAMILY_NAME: "ubuntu-2410-amd64"

# Curl-command prefix for downloading task artifacts, simply add the
# the url-encoded task name, artifact name, and path as a suffix.
Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/processor.py
Expand Up @@ -57,7 +57,7 @@ def setup(self):
], cmd_as_tag=True)

if (isinstance(self.policy, UbuntuPolicy) and
self.policy.dist_version() == 24.04):
self.policy.dist_version() >= 24.04):
self.cpu_kmods = ['msr']

cpupower_pred = SoSPredicate(self, kmods=self.cpu_kmods)
Expand Down

0 comments on commit 01108d4

Please sign in to comment.