Skip to content

Use default kernel instead of HWE kernel #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weiiwang01 merged 4 commits into from
Aug 11, 2026
Merged

Use default kernel instead of HWE kernel #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0fe7c2
Use default kernel instead of HWE kernel
weiiwang01 Feb 12, 2026
f989438
Update changelog.md
weiiwang01 Feb 12, 2026
5a8d84b
Merge origin/main and resolve conflicts
Copilot Aug 10, 2026
932899b
Limit GITHUB_TOKEN permissions in integration workflow
Copilot Aug 10, 2026
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
2 changes: 2 additions & 0 deletions .github/workflows/integration_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ concurrency:

jobs:
integration-tests:
permissions:
contents: read
uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
secrets: inherit
with:
Expand Down
9 changes: 1 addition & 8 deletions app/src/github_runner_image_builder/templates/cloud-init.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,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 @@ -104,11 +103,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}
# Skip installing the HWE kernel package on resolute since there is no HWE kernel for it.
if [ $RELEASE != "resolute" ]; then
echo "Installing linux-generic-hwe-${hwe_version}"
DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y --install-recommends linux-generic-hwe-${hwe_version}
fi
}

function disable_unattended_upgrades() {
Expand Down Expand Up @@ -231,7 +225,6 @@ 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 }}"
Expand All @@ -242,7 +235,7 @@ configure_proxy "$proxy"
if [ "$github_runner_arch" == "arm" ]; then
enable_armhf_multiarch
fi
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
6 changes: 0 additions & 6 deletions app/tests/integration/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ class Commands:
Commands(
name="test sctp support", command="sudo apt-get install lksctp-tools -yq && checksctp"
),
# Exclude 26.04 from HWE kernel test since there is no HWE kernel for it.
Commands(
name="test that HWE kernel is installed (only for non-resolute)",
command="lsb_release -r | grep 26.04 || 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
10 changes: 1 addition & 9 deletions app/tests/unit/test_openstack_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@ def test__generate_cloud_init_script(
if arch == openstack_builder.Arch.ARM
else openstack_builder.BaseImage.JAMMY
)
expected_hwe = openstack_builder.BaseImage.get_version(base)
assert (
openstack_builder._generate_cloud_init_script(
image_config=openstack_builder.config.ImageConfig(
Expand Down Expand Up @@ -811,7 +810,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 @@ -835,11 +833,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}}
# Skip installing the HWE kernel package on resolute since there is no HWE kernel for it.
if [ $RELEASE != "resolute" ]; then
echo "Installing linux-generic-hwe-${{hwe_version}}"
DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get install -y --install-recommends linux-generic-hwe-${{hwe_version}}
fi
}}

function disable_unattended_upgrades() {{
Expand Down Expand Up @@ -963,7 +956,6 @@ def test__generate_cloud_init_script(

proxy="test.proxy.internal:3128"
apt_packages="{expected_apt_packages}"
hwe_version="{expected_hwe}"
github_runner_version=""
github_runner_arch="{arch.value}"
runner_binary_repo="canonical/github-actions-runner"
Expand All @@ -974,7 +966,7 @@ def test__generate_cloud_init_script(
if [ "$github_runner_arch" == "arm" ]; then
enable_armhf_multiarch
fi
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
4 changes: 4 additions & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@

- Update integration tests that were intentionally not done in #185.

## [#196 fix: use default kernel instead of HWE kernel](https://github.com/canonical/github-runner-image-builder-operator/pull/196) (2026-02-12)

Check warning on line 35 in docs/changelog.md

View workflow job for this annotation

GitHub Actions / docs-checks / vale 

[vale] reported by reviewdog 🐶
[Canonical.012-date-format] Use the 'January 1, 1970' format instead of '2026-02-12'

Raw Output:
{"message": "[Canonical.012-date-format] Use the 'January 1, 1970' format instead of '2026-02-12'", "location": {"path": "docs/changelog.md", "range": {"start": {"line": 35, "column": 134}}}, "severity": "WARNING"}

* Use the default kernel instead of the HWE kernel in GitHub runner images.

## [#185 Remove aproxy installation and add proxy support in workload](https://github.com/canonical/github-runner-image-builder-operator/pull/185) (2026-01-20)

- Remove `aproxy` snap installation in the charm and inject proxy values from the model config into the workload process.
Expand Down
Loading