Ubuntu change kernel location (#208)

metal-stack · Nov 17, 2023 · d1ab365 · d1ab365
1 parent 2d3f106
commit d1ab365
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/debian/context/kernel-installation.sh b/debian/context/kernel-installation.sh
@@ -11,7 +11,7 @@ if [ "${ID}" = "ubuntu" ] ; then
          --accept-regex generic \
          --recursive \
          --execute robots=off \
-        https://kernel.ubuntu.com/~kernel-ppa/mainline/${UBUNTU_MAINLINE_KERNEL_VERSION}/amd64/
+        https://kernel.ubuntu.com/mainline/${UBUNTU_MAINLINE_KERNEL_VERSION}/amd64/
 
     apt-get install --yes \
         /tmp/linux-image* \

diff --git a/debian/docker-make.debian.yaml b/debian/docker-make.debian.yaml
@@ -29,7 +29,7 @@ builds:
       - SEMVER_MAJOR_MINOR=12
       - SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}
       # see https://packages.debian.org/bookworm/kernel/ for available versions
-      - KERNEL_VERSION=6.1.0-12
+      - KERNEL_VERSION=6.1.0-13
     after:
       - cd ../ && OS_NAME=${OS_NAME} CIS_VERSION=${CIS_VERSION} ./test.sh quay.io/metalstack/${OS_NAME}:${SEMVER}
       - OS_NAME=${OS_NAME} SEMVER_MAJOR_MINOR=${SEMVER_MAJOR_MINOR} SEMVER_PATCH=${SEMVER_PATCH} ../export.sh
diff --git a/debian/docker-make.ubuntu.yaml b/debian/docker-make.ubuntu.yaml
@@ -12,8 +12,8 @@ default-build-args:
   - DOCKER_APT_OS=ubuntu
   - DOCKER_APT_CHANNEL=jammy
   - CRI_VERSION=v1.28.0
-  # see https://kernel.ubuntu.com/~kernel-ppa/mainline for available versions
-  - UBUNTU_MAINLINE_KERNEL_VERSION=v6.1.55
+  # see https://kernel.ubuntu.com/mainline for available versions
+  - UBUNTU_MAINLINE_KERNEL_VERSION=v6.6.1
   - ICE_VERSION=1.12.7
   - ICE_PKG_VERSION=1.3.35.0