Skip to content

ci: enable ubuntu 26.04 snapshot for testing #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kenhys wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ci: enable ubuntu 26.04 snapshot for testing #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/apt.matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"label": "Ubuntu Resolute amd64",
"rake-job": "ubuntu-resolute",
"test-docker-image": "ubuntu:resolute",
"test-incus-image": "images:ubuntu/26.04"
"test-incus-image": "fluent:ubuntu/26.04"
}
]
}
27 changes: 3 additions & 24 deletions .github/workflows/apt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
# FIXME: 26.04 incus image is not ready yet
exclude:
- label: "Ubuntu Resolute amd64"
rake-job: "ubuntu-resolute"
test-docker-image: "ubuntu:resolute"
test-incus-image: "images:ubuntu/26.04"
matrix: ${{ fromJSON(needs.define-matrix.outputs.matrix) }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
Expand All @@ -360,14 +353,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
# FIXME: 26.04 incus image is not ready yet
exclude:
- label: "Ubuntu Resolute amd64"
rake-job: "ubuntu-resolute"
test-docker-image: "ubuntu:resolute"
test-incus-image: "images:ubuntu/26.04"
matrix: ${{ fromJSON(needs.define-matrix.outputs.matrix) }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
Expand Down Expand Up @@ -395,14 +381,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.define-matrix.outputs.matrix).include }}
# FIXME: 26.04 incus image is not ready yet
exclude:
- label: "Ubuntu Resolute amd64"
rake-job: "ubuntu-resolute"
test-docker-image: "ubuntu:resolute"
test-incus-image: "images:ubuntu/26.04"
matrix: ${{ fromJSON(needs.define-matrix.outputs.matrix) }}
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
Expand Down
2 changes: 2 additions & 0 deletions fluent-package/test-tools/setup-incus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ sudo apt install -y -V incus
sudo iptables -I DOCKER-USER -i incusbr0 -j ACCEPT
sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
sudo incus admin init --auto
# enable incus legacy/snapshot images
sudo incus remote add fluent https://fluentd.cdn.cncf.io/test/incus-images --protocol=simplestreams

Loading