Skip to content

Commit 5f1510f

Browse files
Watson1978kenhys
andauthored
Backport(v5): ci: fix wrong grouping about CGroup v1 (#841) (#917)
Backport #841 AmazonLinux 2023 contains code for CGroup v1, but it is not officially supported. See https://docs.aws.amazon.com/eks/latest/userguide/al2023.html While AL2023 still includes code that can make the system run using cgroupv1, this isn’t a recommended or supported configuration. This configuration will be completely removed in a future major release of Amazon Linux. Signed-off-by: Kentaro Hayashi <[email protected]> Signed-off-by: Shizuo Fujita <[email protected]> Co-authored-by: Kentaro Hayashi <[email protected]>
1 parent cbcaf9e commit 5f1510f

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

.github/workflows/yum.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ jobs:
168168
# matrix:
169169
# label:
170170
# - AmazonLinux 2 x86_64
171-
# - AmazonLinux 2023 x86_64
172171
# test-file:
173172
# - "update-from-v4.sh"
174173
# - "update-to-next-version-with-backward-compat-for-v4.sh"
@@ -179,15 +178,6 @@ jobs:
179178
# include:
180179
# - label: AmazonLinux 2 x86_64
181180
# rake-job: amazonlinux-2
182-
# - label: AmazonLinux 2023 x86_64
183-
# rake-job: amazonlinux-2023
184-
# exclude:
185-
# - label: AmazonLinux 2023 x86_64
186-
# test-file: update-from-v4.sh
187-
# - label: AmazonLinux 2023 x86_64
188-
# test-file: update-to-next-version-with-backward-compat-for-v4.sh
189-
# - label: AmazonLinux 2023 x86_64
190-
# test-file: downgrade-to-v4.sh
191181
# steps:
192182
# - uses: actions/checkout@v4
193183
# - uses: actions/download-artifact@v4
@@ -228,6 +218,7 @@ jobs:
228218
label:
229219
- RockyLinux 8 x86_64
230220
- AlmaLinux 9 x86_64
221+
- AmazonLinux 2023 x86_64
231222
test-file:
232223
- "update-from-v4.sh"
233224
- "update-to-next-version-with-backward-compat-for-v4.sh"
@@ -242,6 +233,16 @@ jobs:
242233
- label: AlmaLinux 9 x86_64
243234
rake-job: almalinux-9
244235
container-image: images:almalinux/9
236+
- label: AmazonLinux 2023 x86_64
237+
rake-job: amazonlinux-2023
238+
container-image: images:amazonlinux/2023
239+
exclude:
240+
- label: AmazonLinux 2023 x86_64
241+
test: update-from-v4.sh
242+
- label: AmazonLinux 2023 x86_64
243+
test: update-to-next-version-with-backward-compat-for-v4.sh
244+
- label: AmazonLinux 2023 x86_64
245+
test: downgrade-to-v4.sh
245246
steps:
246247
- uses: actions/checkout@v4
247248
- uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)