github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-21 09:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11061 from RuoqingHe/2025-03-21-generalize-non-kvm

Browse Source 
ci: Generalize `GITHUB_RUNNER_CI_ARM64`
This commit is contained in:
Aurélien Bombo 2025-03-21 15:23:51 -05:00 committed by GitHub
commit 17baa6199b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-checks.yaml vendored
View File

@ -115,7 +115,7 @@ jobs:
- name: Skip tests that depend on virtualization capable runners when needed - name: Skip tests that depend on virtualization capable runners when needed
if: ${{ endsWith(inputs.instance, '-arm') }} if: ${{ endsWith(inputs.instance, '-arm') }}
run: | run: |
echo "GITHUB_RUNNER_CI_ARM64=true" >> "$GITHUB_ENV" echo "GITHUB_RUNNER_CI_NON_VIRT=true" >> "$GITHUB_ENV"
- name: Running `${{ matrix.command }}` for ${{ matrix.component.name }} - name: Running `${{ matrix.command }}` for ${{ matrix.component.name }}
run: | run: |
cd ${{ matrix.component.path }} cd ${{ matrix.component.path }}

2
src/runtime/cmd/kata-runtime/kata-check_arm64_test.go
View File

@ -25,7 +25,7 @@ func setupCheckHostIsVMContainerCapable(assert *assert.Assertions, cpuInfoFile s
} }
func TestCCCheckCLIFunction(t *testing.T) { func TestCCCheckCLIFunction(t *testing.T) {
if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" { if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization") t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
} }

2
src/runtime/cmd/kata-runtime/kata-env_arm64_test.go
View File

@ -18,7 +18,7 @@ func getExpectedHostDetails(tmpdir string) (HostInfo, error) {
} }
func TestEnvGetEnvInfoSetsCPUType(t *testing.T) { func TestEnvGetEnvInfoSetsCPUType(t *testing.T) {
if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" { if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization") t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
} }
testEnvGetEnvInfoSetsCPUTypeGeneric(t) testEnvGetEnvInfoSetsCPUTypeGeneric(t)

6
src/runtime/cmd/kata-runtime/kata-env_test.go
View File

@ -375,7 +375,7 @@ func TestEnvGetMetaInfo(t *testing.T) {
} }
func TestEnvGetHostInfo(t *testing.T) { func TestEnvGetHostInfo(t *testing.T) {
if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" { if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization") t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
} }
@ -439,7 +439,7 @@ func TestEnvGetHostInfoNoProcVersion(t *testing.T) {
} }
func TestEnvGetEnvInfo(t *testing.T) { func TestEnvGetEnvInfo(t *testing.T) {
if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" { if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization") t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
} }
@ -471,7 +471,7 @@ func TestEnvGetEnvInfo(t *testing.T) {
} }
func TestEnvGetEnvInfoNoHypervisorVersion(t *testing.T) { func TestEnvGetEnvInfoNoHypervisorVersion(t *testing.T) {
if os.Getenv("GITHUB_RUNNER_CI_ARM64") == "true" { if os.Getenv("GITHUB_RUNNER_CI_NON_VIRT") == "true" {
t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization") t.Skip("Skipping the test as the GitHub self hosted runners for ARM64 do not support Virtualization")
} }