From c936d76faac69af5e9619a01645b6eb48d2db56a Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 11 Aug 2026 14:56:52 +0200 Subject: [PATCH] ci: run e2e matrix with and without the containerd image store Several image-identity bugs only manifest on one image store backend: the graphdriver and containerd stores report different digest kinds and resolve them differently (#14005, #14007, #14014 all reproduce only under the containerd store, which no CI job covered). Cross the stable e2e jobs with a store axis (graphdriver/containerd) so both backends are exercised in plugin and standalone modes; oldstable jobs stay on the default graphdriver. Signed-off-by: Nicolas De Loof --- .github/workflows/ci.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f55b3aee..bb79fdd04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -165,43 +165,46 @@ jobs: e2e: runs-on: ubuntu-latest - name: e2e (${{ matrix.mode }}, ${{ matrix.channel }}${{ matrix.store && format(', {0}', matrix.store) || '' }}) + name: e2e (${{ matrix.mode }}, ${{ matrix.channel }}, ${{ matrix.store }}) strategy: fail-fast: false matrix: include: - # current stable + # current stable, both image store backends: several digest-identity + # bugs only manifest on one of them (graphdriver vs containerd) - mode: plugin engine: 29 channel: stable + store: graphdriver + - mode: plugin + engine: 29 + channel: stable + store: containerd - mode: standalone engine: 29 channel: stable + store: graphdriver + - mode: standalone + engine: 29 + channel: stable + store: containerd # old stable (latest major - 1) - mode: plugin engine: 28 channel: oldstable + store: graphdriver - mode: standalone engine: 28 channel: oldstable - - # containerd image store (non-graphdriver digest behavior) - - mode: plugin - engine: 29 - channel: stable - store: containerd + store: graphdriver steps: - name: Prepare run: | mode=${{ matrix.mode }} engine=${{ matrix.engine }} store=${{ matrix.store }} - pair="${mode}-${engine}" - if [ -n "$store" ]; then - pair="${pair}-${store}" - fi - echo "MODE_ENGINE_PAIR=${pair}" >> $GITHUB_ENV + echo "MODE_ENGINE_PAIR=${mode}-${engine}-${store}" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1