From 5ea82d39d9b897a28f92f58c322dd28d4012012a Mon Sep 17 00:00:00 2001 From: Gianmaria Del Monte Date: Fri, 6 Oct 2023 11:38:59 +0200 Subject: [PATCH] fix upload artifact --- .github/workflows/compose.yml | 2 +- .github/workflows/test.yml | 3 --- tests/docker/docker-compose.yml | 10 ++++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/compose.yml b/.github/workflows/compose.yml index 2828211180..46dcc8ccdf 100644 --- a/.github/workflows/compose.yml +++ b/.github/workflows/compose.yml @@ -6,7 +6,6 @@ on: required: true type: string image: - required: true type: string submodules: type: boolean @@ -25,6 +24,7 @@ jobs: submodules: ${{ inputs.submodules }} - name: Download image uses: ishworkh/docker-image-artifact-download@v1 + if: ${{ inputs.image != "" }} with: image: ${{ inputs.image }} - name: Test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87bbaacb00..33abc742db 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -86,14 +86,12 @@ jobs: uses: ./.github/workflows/compose.yml with: test: ${{ matrix.test }} - image: ${{ needs.docker-revad.outputs.image }} acceptance-1: needs: - docker-revad-eos uses: ./.github/workflows/compose.yml with: test: acceptance-1 - image: ${{ needs.docker-revad.outputs.image }} submodules: true acceptance-2: needs: @@ -105,7 +103,6 @@ jobs: uses: ./.github/workflows/compose.yml with: test: acceptance-2 - image: ${{ needs.docker-revad.outputs.image }} submodules: true parts: 6 part: ${{ matrix.part }} diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index 1eb83fef38..db0176e055 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -1,10 +1,12 @@ version: "3.4" services: revad: - image: ${REVAD_IMAGE} - # build: - # context: ../../ - # dockerfile: docker/Dockerfile.revad-eos + # image: ${REVAD_IMAGE} + # we build the reva image with eos because it's faster + # instead of uploading and share through the github runners + build: + context: ../../ + dockerfile: docker/Dockerfile.revad-eos volumes: - ../revad:/etc/revad working_dir: /etc/revad/