diff --git a/.cirrus.yml b/.cirrus.yml index cec2be66ac..88ed9f748a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,11 +8,10 @@ env: DEBIAN_NAME: "debian-11" - UBUNTU_LATEST_NAME: "ubuntu-24.04" + UBUNTU_LATEST_NAME: "ubuntu-24.10" UBUNTU_NAME: "ubuntu-24.04" UBUNTU_PRIOR_NAME: "ubuntu-22.04" UBUNTU_PRIOR2_NAME: "ubuntu-20.04" - UBUNTU_PRIOR3_NAME: "ubuntu-18.04" CENTOS_9_NAME: "centos-stream-9" @@ -29,13 +28,12 @@ env: FEDORA_IMAGE_NAME: "fedora-cloud-base-gcp-38-1-6-x86-64" FEDORA_PRIOR_IMAGE_NAME: "fedora-cloud-base-gcp-37-1-7-x86-64" - 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-v20240501" - UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20240426" - UBUNTU_PRIOR3_IMAGE_NAME: "ubuntu-1804-bionic-v20240116a" - UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20240423" + UBUNTU_DEB_IMAGE_NAME: "ubuntu-minimal-2410-oracular-amd64-v20241021" + UBUNTU_LATEST_IMAGE_NAME: "ubuntu-2410-oracular-amd64-v20241021" + UBUNTU_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20241004" + UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2204-jammy-v20240927" + UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20241016" + UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20241004" UBUNTU_DEVEL_FAMILY_NAME: "ubuntu-2410-amd64" # Curl-command prefix for downloading task artifacts, simply add the @@ -208,12 +206,12 @@ report_stageone_task: PROJECT: ${UBUNTU_PROJECT} BUILD_NAME: "${UBUNTU_PRIOR2_NAME} - ${PKG}" VM_IMAGE_NAME: ${UBUNTU_PRIOR2_IMAGE_NAME} - - env: &ubuntuprior3 + - env: &ubuntu-latest-snap PKG: "snap" PROJECT: ${UBUNTU_PROJECT} - BUILD_NAME: "${UBUNTU_PRIOR3_NAME} - ${PKG}" - VM_IMAGE_NAME: ${UBUNTU_PRIOR3_IMAGE_NAME} - - env: &ubuntu-latest + BUILD_NAME: "${UBUNTU_LATEST_NAME} - ${PKG}" + VM_IMAGE_NAME: ${UBUNTU_LATEST_IMAGE_NAME} + - env: &ubuntu-latest-deb PKG: "deb" PROJECT: ${UBUNTU_PROJECT} BUILD_NAME: "${UBUNTU_LATEST_NAME} - ${PKG}" @@ -289,7 +287,8 @@ report_stagetwo_task: - env: *centos9 - env: *fedora - env: *ubuntu - - env: *ubuntu-latest + - env: *ubuntu-latest-snap + - env: *ubuntu-latest-deb setup_script: *setup install_pexpect_script: | if [ $(command -v apt) ]; then diff --git a/debian/changelog b/debian/changelog index f969f4c773..3e1a4b68c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sosreport (4.8.1-2) oracular; urgency=medium + + * Change series to oracular + + -- Arif Ali Sat, 26 Oct 2024 13:14:15 +0000 + sosreport (4.8.1) noble; urgency=medium * New upstream release diff --git a/sos/report/plugins/processor.py b/sos/report/plugins/processor.py index 44f07dca34..783129790f 100644 --- a/sos/report/plugins/processor.py +++ b/sos/report/plugins/processor.py @@ -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() >= 22.04): self.cpu_kmods = ['msr'] cpupower_pred = SoSPredicate(self, kmods=self.cpu_kmods)