Skip to content

Commit 4c76de1

Browse files
saschagrunertk8s-ci-robot
authored andcommitted
Rollback to ubuntu 20.04 for vagrant tests
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 4937f53 commit 4c76de1

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ jobs:
6060

6161
e2e-fedora:
6262
needs: image
63-
runs-on: ubuntu-22.04
63+
# TODO: move back to 22.04 when https://github.com/actions/runner-images/issues/10678 got resolved
64+
runs-on: ubuntu-20.04
6465
timeout-minutes: 90
6566
env:
6667
RUN: ./hack/ci/run-fedora.sh
@@ -95,7 +96,8 @@ jobs:
9596
9697
e2e-ubuntu:
9798
needs: image
98-
runs-on: ubuntu-22.04
99+
# TODO: move back to 22.04 when https://github.com/actions/runner-images/issues/10678 got resolved
100+
runs-on: ubuntu-20.04
99101
timeout-minutes: 90
100102
env:
101103
RUN: ./hack/ci/run-ubuntu.sh
@@ -130,7 +132,8 @@ jobs:
130132
131133
e2e-flatcar:
132134
needs: image
133-
runs-on: ubuntu-22.04
135+
# TODO: move back to 22.04 when https://github.com/actions/runner-images/issues/10678 got resolved
136+
runs-on: ubuntu-20.04
134137
timeout-minutes: 90
135138
env:
136139
RUN: ./hack/ci/run-flatcar.sh
@@ -171,7 +174,8 @@ jobs:
171174
172175
e2e-spoc:
173176
needs: image
174-
runs-on: ubuntu-22.04
177+
# TODO: move back to 22.04 when https://github.com/actions/runner-images/issues/10678 got resolved
178+
runs-on: ubuntu-20.04
175179
timeout-minutes: 90
176180
env:
177181
RUN: ./hack/ci/run-debian.sh
@@ -201,7 +205,8 @@ jobs:
201205

202206
e2e-seccomp-profile:
203207
needs: image
204-
runs-on: ubuntu-22.04
208+
# TODO: move back to 22.04 when https://github.com/actions/runner-images/issues/10678 got resolved
209+
runs-on: ubuntu-20.04
205210
timeout-minutes: 90
206211
env:
207212
RUN: ./hack/ci/run-ubuntu.sh
@@ -231,7 +236,8 @@ jobs:
231236

232237
e2e-apparmor-profile:
233238
needs: image
234-
runs-on: ubuntu-22.04
239+
# TODO: move back to 22.04 when https://github.com/actions/runner-images/issues/10678 got resolved
240+
runs-on: ubuntu-20.04
235241
timeout-minutes: 90
236242
env:
237243
RUN: ./hack/ci/run-ubuntu.sh

dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ dependencies:
166166
match: CRUN_VERSION
167167

168168
- name: runc
169-
version: v1.1.14
169+
version: v1.1.15
170170
refPaths:
171171
- path: examples/baseprofile-runc.yaml
172172
match: name

examples/baseprofile-runc.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: security-profiles-operator.x-k8s.io/v1beta1
33
kind: SeccompProfile
44
metadata:
5-
name: runc-v1.1.14
5+
name: runc-v1.1.15
66
spec:
77
defaultAction: SCMP_ACT_ERRNO
88
architectures:
@@ -54,7 +54,6 @@ spec:
5454
- pipe2
5555
- pivot_root
5656
- prctl
57-
- pread64
5857
- prlimit64
5958
- read
6059
- readlinkat

installation-usage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ metadata:
521521
name: profile1
522522
spec:
523523
defaultAction: SCMP_ACT_ERRNO
524-
baseProfileName: runc-v1.1.14
524+
baseProfileName: runc-v1.1.15
525525
syscalls:
526526
- action: SCMP_ACT_ALLOW
527527
names:
@@ -1998,7 +1998,7 @@ The following checks were performed on each of these signatures:
19981998
16:32:33.208743 Copying profile from repository
19991999
16:32:34.119652 Reading profile
20002000
16:32:34.119677 Trying to unmarshal seccomp profile
2001-
16:32:34.120114 Got SeccompProfile: runc-v1.1.14
2001+
16:32:34.120114 Got SeccompProfile: runc-v1.1.15
20022002
16:32:34.120119 Saving profile in: /tmp/profile.yaml
20032003
```
20042004

@@ -2134,7 +2134,7 @@ way, for example if a profile does not support any platform:
21342134
11:07:18.359152 Trying to read profile: profile-linux-amd64.yaml
21352135
11:07:18.359209 Trying to read profile: profile.yaml
21362136
11:07:18.359224 Trying to unmarshal seccomp profile
2137-
11:07:18.359728 Got SeccompProfile: runc-v1.1.14
2137+
11:07:18.359728 Got SeccompProfile: runc-v1.1.15
21382138
11:07:18.359732 Saving profile in: /tmp/profile.yaml
21392139
```
21402140

test/tc_base_profiles_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
const (
27-
baseProfileNameRunc = "runc-v1.1.14"
27+
baseProfileNameRunc = "runc-v1.1.15"
2828
baseProfileNameCrun = "crun-v1.17"
2929
)
3030

0 commit comments

Comments
 (0)