From d0fe7c2e443a42d4d5bdcf1a17dabb0b9efa3a0d Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Thu, 12 Feb 2026 18:49:45 +0800 Subject: [PATCH 1/2] Use default kernel instead of HWE kernel --- .../github_runner_image_builder/templates/cloud-init.sh.j2 | 6 +----- app/tests/integration/commands.py | 5 ----- app/tests/unit/test_openstack_builder.py | 6 +----- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/src/github_runner_image_builder/templates/cloud-init.sh.j2 b/app/src/github_runner_image_builder/templates/cloud-init.sh.j2 index 1f905ee9..8b0f2168 100644 --- a/app/src/github_runner_image_builder/templates/cloud-init.sh.j2 +++ b/app/src/github_runner_image_builder/templates/cloud-init.sh.j2 @@ -55,7 +55,6 @@ EOF function install_apt_packages() { local packages="$1" - local hwe_version="$2" # The gh package (GitHub CLI application) is not in the APT repository for focal. # For focal, the apt repository of GitHub is added. @@ -72,8 +71,6 @@ function install_apt_packages() { DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get upgrade -y echo "Installing apt packages $packages" DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y --no-install-recommends ${packages} - echo "Installing linux-generic-hwe-${hwe_version}" - DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y --install-recommends linux-generic-hwe-${hwe_version} } function disable_unattended_upgrades() { @@ -157,13 +154,12 @@ function configure_system_users() { proxy="{{ PROXY }}" apt_packages="{{ APT_PACKAGES }}" -hwe_version="{{ HWE_VERSION }}" github_runner_version="{{ RUNNER_VERSION }}" github_runner_arch="{{ RUNNER_ARCH }}" runner_binary_repo="{{ RUNNER_BINARY_REPO }}" configure_proxy "$proxy" -install_apt_packages "$apt_packages" "$hwe_version" +install_apt_packages "$apt_packages" disable_unattended_upgrades enable_network_fair_queuing_congestion configure_usr_local_bin diff --git a/app/tests/integration/commands.py b/app/tests/integration/commands.py index e7d3e740..a2c7cd05 100644 --- a/app/tests/integration/commands.py +++ b/app/tests/integration/commands.py @@ -52,11 +52,6 @@ class Commands: Commands( name="test sctp support", command="sudo apt-get install lksctp-tools -yq && checksctp" ), - Commands( - name="test that HWE kernel is installed", - command="uname -a | " - "grep $(dpkg -l | grep linux-generic-hwe | awk '{print $3}' | cut -d'.' -f1-3)", - ), Commands( name="test network congestion policy(fq)", command="sudo sysctl -a | grep 'net.core.default_qdisc = fq'", diff --git a/app/tests/unit/test_openstack_builder.py b/app/tests/unit/test_openstack_builder.py index 33099b40..6dd69481 100644 --- a/app/tests/unit/test_openstack_builder.py +++ b/app/tests/unit/test_openstack_builder.py @@ -763,7 +763,6 @@ def test__generate_cloud_init_script( function install_apt_packages() {{ local packages="$1" - local hwe_version="$2" # The gh package (GitHub CLI application) is not in the APT repository for focal. # For focal, the apt repository of GitHub is added. @@ -783,8 +782,6 @@ def test__generate_cloud_init_script( DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get upgrade -y echo "Installing apt packages $packages" DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y --no-install-recommends ${{packages}} - echo "Installing linux-generic-hwe-${{hwe_version}}" - DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y --install-recommends linux-generic-hwe-${{hwe_version}} }} function disable_unattended_upgrades() {{ @@ -869,13 +866,12 @@ def test__generate_cloud_init_script( proxy="test.proxy.internal:3128" apt_packages="build-essential cargo docker.io gh jq npm pkg-config python-is-python3 python3-dev python3-pip rustc shellcheck socat tar time unzip wget{(' ' + ' '.join(additional_apt_packages)) if additional_apt_packages else ''}" -hwe_version="22.04" github_runner_version="" github_runner_arch="{arch.value}" runner_binary_repo="canonical/github-actions-runner" configure_proxy "$proxy" -install_apt_packages "$apt_packages" "$hwe_version" +install_apt_packages "$apt_packages" disable_unattended_upgrades enable_network_fair_queuing_congestion configure_usr_local_bin From f989438b2523a9d0e78426f7e5dd18c39673bef7 Mon Sep 17 00:00:00 2001 From: Weii Wang Date: Thu, 12 Feb 2026 18:55:07 +0800 Subject: [PATCH 2/2] Update changelog.md --- docs/changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index 603312f4..d7dc1099 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,9 @@ +## [#196 fix: use default kernel instead of HWE kernel](https://github.com/canonical/github-runner-image-builder-operator/pull/196) (2026-02-12) +* Use the default kernel instead of the HWE kernel in GitHub runner images. + ## [#172 feat: apt upgrade](https://github.com/canonical/github-runner-image-builder-operator/pull/172) (2025-11-26) * Apply apt-update and apt-upgrade to GH runner images by applying them during cloud-init.