diff --git a/.github/workflows/.vm.yml b/.github/workflows/.vm.yml index 1ae6e90cfc..8474367996 100644 --- a/.github/workflows/.vm.yml +++ b/.github/workflows/.vm.yml @@ -22,6 +22,7 @@ on: env: GO_VERSION: "1.25.5" TESTSTAT_VERSION: v0.1.25 + TEMPLATE_NAME: ${{ inputs.template }} jobs: integration: @@ -147,7 +148,8 @@ jobs: run: | set -eux -o pipefail limactl cp -v -r default:/tmp/docker/bundles . || true - reportsName="$(basename ${{ inputs.template }})" + reportsName="${{ env.TEMPLATE_NAME }}" + reportsName="${reportsName#template:}" if [ -n "${{ matrix.mode }}" ]; then reportsName="$reportsName-${{ matrix.mode }}" fi @@ -189,7 +191,10 @@ jobs: cache: false - name: Prepare reports - run: echo "TESTREPORTS_NAME=$(basename ${{ inputs.template }})*" >> $GITHUB_ENV + run: | + TEMPLATE="${{ env.TEMPLATE_NAME }}" + TEMPLATE="${TEMPLATE#template:}" + echo "TESTREPORTS_NAME=${TEMPLATE}*" >> $GITHUB_ENV - name: Download reports uses: actions/download-artifact@v6 diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml index 77abc2a9c3..e92ff7a312 100644 --- a/.github/workflows/vm.yml +++ b/.github/workflows/vm.yml @@ -40,7 +40,7 @@ jobs: # FIXME: use almalinux-8, then probably no need to keep oraclelinux-8 here. # On almalinux-8, port forwarding tests are failing: # https://github.com/moby/moby/pull/49819#issuecomment-2815676000 - - template://oraclelinux-8 # Oracle's kernel 5.15 - # - template://almalinux-8 # kernel 4.18 + - template:oraclelinux-8 # Oracle's kernel 5.15 + # - template:almalinux-8 # kernel 4.18 with: template: ${{ matrix.template }}