Update GitHub matrix to use correct 6.1.x kernel (pixie-io#2004)

ddelnano · web-flow · commit 9ae53a86bb73 · 2024-09-04T08:58:40.000-07:00
Summary: Update GitHub matrix to use correct 6.1.x kernel Builds after pixie-io#1995 would fail since GitHub would attempt to run the 6.1.8 kernel build, which bazel no longer understands. This also updates the qemu test runner kernel that was incorrectly updated in pixie-io#1999. I thought I had exercised that default value with my testing, but it didn't trigger that default value. Relevant Issues: N/A Type of change: /kind bugfix Test Plan: GitHub build on pixie-io#2002 which pulls in the matrix change is no longer failing
diff --git a/bazel/test_runners/qemu_with_kernel/runner.bzl b/bazel/test_runners/qemu_with_kernel/runner.bzl
@@ -84,7 +84,7 @@ qemu_with_kernel_test_runner = rule(
     implementation = _test_runner_impl,
     attrs = {
         "kernel_image": attr.label(
-            default = Label("@linux_build_6_1_18_x86_64//file:linux-build.tar.gz"),
+            default = Label("@linux_build_6_1_106_x86_64//file:linux-build.tar.gz"),
             allow_single_file = True,
         ),
         "_busybox": attr.label(
diff --git a/ci/github/matrix.sh b/ci/github/matrix.sh
@@ -39,7 +39,7 @@ all_kernel_versions=(
 )
 default_kernel_versions=(
   "4.14.254"
-  "6.1.18"
+  "6.1.106"
 )
 kernel_versions=( "${default_kernel_versions[@]}" )
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ all_kernel_versions=(`
`39`	`39`	`)`
`40`	`40`	`default_kernel_versions=(`
`41`	`41`	`"4.14.254"`
`42`		`- "6.1.18"`
	`42`	`+ "6.1.106"`
`43`	`43`	`)`
`44`	`44`	`kernel_versions=( "${default_kernel_versions[@]}" )`
`45`	`45`