diff options
| -rw-r--r-- | .cirrus.yml | 8 | ||||
| -rw-r--r-- | sos/report/plugins/processor.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e87f9f0a..2c66180e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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. diff --git a/sos/report/plugins/processor.py b/sos/report/plugins/processor.py index 0cc8aa7f..bb0de290 100644 --- a/sos/report/plugins/processor.py +++ b/sos/report/plugins/processor.py @@ -57,7 +57,7 @@ class Processor(Plugin, IndependentPlugin): ], 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) |