Skip to content

Commit 78b9cac

Browse files
authored
apt: enable ubuntu 26.04 (#1024)
Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
1 parent 3409a7a commit 78b9cac

3 files changed

Lines changed: 33 additions & 0 deletions

File tree

.github/workflows/apt.matrix.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"rake-job": "ubuntu-noble",
2424
"test-docker-image": "ubuntu:noble",
2525
"test-incus-image": "images:ubuntu/24.04"
26+
},
27+
{
28+
"label": "Ubuntu Resolute amd64",
29+
"rake-job": "ubuntu-resolute",
30+
"test-docker-image": "ubuntu:resolute",
31+
"test-incus-image": "fluent:ubuntu/26.04"
2632
}
2733
]
2834
}

.github/workflows/apt.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ jobs:
205205
- Debian trixie amd64
206206
- Ubuntu Jammy amd64
207207
- Ubuntu Noble amd64
208+
- Ubuntu Resolute amd64
208209
test:
209210
- "update-from-v4.sh"
210211
- "update-from-v4.sh via-v5"
@@ -245,6 +246,9 @@ jobs:
245246
- label: Ubuntu Noble amd64
246247
rake-job: ubuntu-noble
247248
container-image: images:ubuntu/24.04
249+
- label: Ubuntu Resolute amd64
250+
rake-job: ubuntu-resolute
251+
container-image: fluent:ubuntu/26.04
248252
exclude:
249253
- label: Debian bookworm amd64
250254
test: update-from-v4.sh
@@ -279,6 +283,27 @@ jobs:
279283
test: update-to-next-version-with-backward-compat-for-v4.sh
280284
- label: Ubuntu Noble amd64
281285
test: downgrade-to-v4.sh
286+
# Resolute
287+
- label: Ubuntu Resolute amd64
288+
test: update-from-v4.sh
289+
- label: Ubuntu Resolute amd64
290+
test: update-from-v4.sh via-v5
291+
- label: Ubuntu Resolute amd64
292+
test: update-from-v5-lts.sh
293+
- label: Ubuntu Resolute amd64
294+
test: downgrade-to-v4.sh
295+
- label: Ubuntu Resolute amd64
296+
test: downgrade-to-v4.sh
297+
- label: Ubuntu Resolute amd64
298+
test: downgrade-to-v5-lts.sh
299+
- label: Ubuntu Resolute amd64
300+
test: downgrade-to-v6-lts-tmpfiles.sh
301+
- label: Ubuntu Resolute amd64
302+
test: update-to-next-version-with-backward-compat-for-v4.sh
303+
- label: Ubuntu Resolute amd64
304+
test: install-newly.sh v6
305+
- label: Ubuntu Resolute amd64
306+
test: install-newly.sh lts
282307
steps:
283308
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
284309
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

fluent-package/test-tools/setup-incus.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ sudo iptables -I DOCKER-USER -i incusbr0 -j ACCEPT
99
sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
1010
sudo incus admin init --auto
1111

12+
# Enable custom incus images
13+
sudo incus remote add fluent https://fluentd.cdn.cncf.io/test/incus-images --accept-certificate --protocol=simplestreams

0 commit comments

Comments
 (0)