diff --git a/.github/actions/image-test/action.yml b/.github/actions/image-test/action.yml index c6184589f..167851bba 100644 --- a/.github/actions/image-test/action.yml +++ b/.github/actions/image-test/action.yml @@ -4,9 +4,6 @@ description: Build and test the container image runs: using: composite steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -14,7 +11,7 @@ runs: uses: docker/build-push-action@v4 with: context: . - platforms: ${{ matrix.build-arch }} + platforms: linux/amd64 tags: localhost/ansible-rulebook:test load: true @@ -23,4 +20,4 @@ runs: run: > docker run --rm -u 0 localhost/ansible-rulebook:test bash -c ' pip install -r requirements_test.txt && - pytest -m "e2e" -n auto' + EDA_E2E_CMD_TIMEOUT=90 pytest -m "e2e" -n auto' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22b4b9989..438755aa9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,14 +81,6 @@ jobs: verbose: true build-and-test-image: - # we must use a matrix because buildx load - # does not currently support multi-arch. - # https://docs.docker.com/engine/reference/commandline/buildx_build/#docker - strategy: - matrix: - build-arch: - - linux/amd64 - - linux/arm64 runs-on: ubuntu-latest steps: