From 2db9e63d433099937076d116074ffa82156d6a1b Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Mon, 17 Jul 2023 11:31:55 +0200 Subject: [PATCH] inputs instead of matrix Signed-off-by: Mauro Morales --- .github/workflows/reusable-build-provider.yaml | 8 ++++---- .github/workflows/reusable-provider-tests.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reusable-build-provider.yaml b/.github/workflows/reusable-build-provider.yaml index dd57a5f759..2d52a0bb1e 100644 --- a/.github/workflows/reusable-build-provider.yaml +++ b/.github/workflows/reusable-build-provider.yaml @@ -60,19 +60,19 @@ jobs: packages: utils/earthly - name: Build PR 🔧 env: - FLAVOR: ${{ matrix.flavor }} - IMAGE: ttl.sh/kairos-${{ matrix.flavor }}-${{ github.sha }}-provider:24h + FLAVOR: ${{ inputs.flavor }} + IMAGE: ttl.sh/kairos-${{ inputs.flavor }}-${{ github.sha }}-provider:24h run: | earthly +ci --SECURITY_SCANS=false --IMAGE=$IMAGE --FLAVOR=$FLAVOR --PROVIDER_KAIROS=true sudo mv build/* . sudo rm -rf build - uses: actions/upload-artifact@v3 with: - name: kairos-${{ matrix.flavor }}-provider.iso.zip + name: kairos-${{ inputs.flavor }}-provider.iso.zip path: | *.iso *.sha256 if-no-files-found: error - name: Push to testing run: | - docker push ttl.sh/kairos-${{ matrix.flavor }}-${{ github.sha }}-provider:24h + docker push ttl.sh/kairos-${{ inputs.flavor }}-${{ github.sha }}-provider:24h diff --git a/.github/workflows/reusable-provider-tests.yaml b/.github/workflows/reusable-provider-tests.yaml index aa9341006d..31fe2d9806 100644 --- a/.github/workflows/reusable-provider-tests.yaml +++ b/.github/workflows/reusable-provider-tests.yaml @@ -45,7 +45,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: kairos-${{ matrix.flavor }}-provider.iso.zip + name: kairos-${{ inputs.flavor }}-provider.iso.zip - name: Run tests env: USE_QEMU: true @@ -53,11 +53,11 @@ jobs: MEMORY: 4000 CPUS: 2 DRIVE_SIZE: 30000 - CONTAINER_IMAGE: ttl.sh/kairos-${{ matrix.flavor }}-${{ github.sha }}-provider:24h + CONTAINER_IMAGE: ttl.sh/kairos-${{ inputs.flavor }}-${{ github.sha }}-provider:24h run: | export ISO=$PWD/$(ls *.iso) cp tests/go.* . - go run github.com/onsi/ginkgo/v2/ginkgo -v --label-filter "${{ matrix.label }}" --fail-fast -r ./tests/ + go run github.com/onsi/ginkgo/v2/ginkgo -v --label-filter "${{ inputs.label }}" --fail-fast -r ./tests/ provider-tests-upgrade-latest: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} runs-on: self-hosted