From 3c0bb118b70f9bb0a9b52ea78424fecc40866216 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Sat, 28 Mar 2026 22:45:29 +0900 Subject: [PATCH] ci: enable ubuntu 26.04 snapshot for testing Signed-off-by: Kentaro Hayashi --- .github/workflows/apt.matrix.json | 2 +- .github/workflows/apt.yml | 27 +++--------------------- fluent-package/test-tools/setup-incus.sh | 2 ++ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/apt.matrix.json b/.github/workflows/apt.matrix.json index 687c6dc3a..4fa320936 100644 --- a/.github/workflows/apt.matrix.json +++ b/.github/workflows/apt.matrix.json @@ -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" } ] } diff --git a/.github/workflows/apt.yml b/.github/workflows/apt.yml index 294ef5854..cd7b5539a 100644 --- a/.github/workflows/apt.yml +++ b/.github/workflows/apt.yml @@ -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 @@ -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 @@ -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 diff --git a/fluent-package/test-tools/setup-incus.sh b/fluent-package/test-tools/setup-incus.sh index c20ac48dc..3c5684247 100755 --- a/fluent-package/test-tools/setup-incus.sh +++ b/fluent-package/test-tools/setup-incus.sh @@ -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