Skip to content

Commit 451fcee

Browse files
committed
CI: switch to GHA for arm
Since GHA now provides ARM, we can switch away from actuated. Many thanks to @alexellis (@self-actuated) for being the sponsor of this project. PS Currently, criu installed from opensuse build farm repo doesn't work on GHA arm. While we investigate it, let's disable this combination. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 1398ba7 commit 451fcee

File tree

2 files changed

+11
-42
lines changed

2 files changed

+11
-42
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
os: [ubuntu-24.04, actuated-arm64-6cpu-8gb]
27+
os: [ubuntu-24.04, ubuntu-24.04-arm]
2828
go-version: [1.23.x, 1.24.x]
2929
rootless: ["rootless", ""]
3030
race: ["-race", ""]
@@ -34,39 +34,20 @@ jobs:
3434
# (need to compile criu) and don't add much value/coverage.
3535
- criu: criu-dev
3636
go-version: 1.23.x
37+
os: ubuntu-24.04
3738
- criu: criu-dev
3839
rootless: rootless
39-
- criu: criu-dev
40-
race: -race
41-
- go-version: 1.23.x
42-
os: actuated-arm64-6cpu-8gb
43-
- race: "-race"
44-
os: actuated-arm64-6cpu-8gb
45-
- criu: criu-dev
46-
os: actuated-arm64-6cpu-8gb
40+
os: ubuntu-24.04
41+
# Do race detection only on latest Go.
42+
- race: -race
43+
go-version: 1.23.x
44+
# CRIU package 4.1-1 from opensuse build farm doesn't work on arm.
45+
- os: ubuntu-24.04-arm
46+
criu: ""
4747

4848
runs-on: ${{ matrix.os }}
4949

5050
steps:
51-
# https://gist.github.com/alexellis/1f33e581c75e11e161fe613c46180771#file-metering-gha-md
52-
# vmmeter start
53-
- name: Prepare arkade
54-
uses: alexellis/arkade-get@master
55-
if: matrix.os == 'actuated-arm64-6cpu-8gb'
56-
with:
57-
crane: latest
58-
print-summary: false
59-
60-
- name: Install vmmeter
61-
if: matrix.os == 'actuated-arm64-6cpu-8gb'
62-
run: |
63-
crane export --platform linux/arm64 ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
64-
65-
- name: Run vmmeter
66-
uses: self-actuated/vmmeter-action@master
67-
if: matrix.os == 'actuated-arm64-6cpu-8gb'
68-
# vmmeter end
69-
7051
- name: checkout
7152
uses: actions/checkout@v4
7253

@@ -92,17 +73,6 @@ jobs:
9273
# kernel config
9374
script/check-config.sh
9475
95-
- name: start sshd (used for testing rootless with systemd user session)
96-
if: ${{ matrix.os == 'actuated-arm64-6cpu-8gb' && matrix.rootless == 'rootless' }}
97-
run: |
98-
# Generate new keys to fix "sshd: no hostkeys available -- exiting."
99-
sudo ssh-keygen -A
100-
if ! sudo systemctl start ssh.service; then
101-
sudo journalctl -xeu ssh.service
102-
exit 1
103-
fi
104-
ps auxw | grep sshd
105-
10676
- name: install deps
10777
run: |
10878
sudo apt update
@@ -119,7 +89,7 @@ jobs:
11989
sudo apt update
12090
sudo apt -y install criu
12191
122-
- name: install CRIU (criu ${{ matrix.criu }})
92+
- name: install CRIU (${{ matrix.criu }})
12393
if: ${{ matrix.criu != '' }}
12494
run: |
12595
sudo apt -qy install \
@@ -150,7 +120,7 @@ jobs:
150120

151121
- name: Allow userns for runc
152122
# https://discourse.ubuntu.com/t/ubuntu-24-04-lts-noble-numbat-release-notes/39890#unprivileged-user-namespace-restrictions-15
153-
if: matrix.os == 'ubuntu-24.04'
123+
if: startsWith(matrix.os, 'ubuntu-24.04')
154124
run: |
155125
sed "s;^profile runc /usr/sbin/;profile runc-test $PWD/;" < /etc/apparmor.d/runc | sudo apparmor_parser
156126

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
[![gha/validate](https://github.com/opencontainers/runc/workflows/validate/badge.svg)](https://github.com/opencontainers/runc/actions?query=workflow%3Avalidate)
77
[![gha/ci](https://github.com/opencontainers/runc/workflows/ci/badge.svg)](https://github.com/opencontainers/runc/actions?query=workflow%3Aci)
88
[![CirrusCI](https://api.cirrus-ci.com/github/opencontainers/runc.svg)](https://cirrus-ci.com/github/opencontainers/runc)
9-
<a href="https://actuated.dev"><img alt="Arm CI sponsored by Actuated" src="https://docs.actuated.dev/images/actuated-badge.png" width="120px"></img></a>
109

1110
## Introduction
1211

0 commit comments

Comments
 (0)