Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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() {
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions app/tests/integration/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down
6 changes: 1 addition & 5 deletions app/tests/unit/test_openstack_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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() {{
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@

<!-- vale Canonical.007-Headings-sentence-case = NO -->

## [#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.

Expand Down
Loading