Skip to content

Commit

Permalink
allow different storages to run in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
gmgigi96 committed Oct 13, 2023
1 parent b861139 commit f528392
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ on:
type: number
part:
type: number
storage:
type: string

jobs:
compose:
Expand All @@ -35,6 +37,7 @@ jobs:
REVAD_IMAGE: ${{ inputs.image }}
PARTS: ${{ inputs.parts }}
PART: ${{ inputs.part }}
STORAGE_DRIVER: ${{ inputs.storage }}
- name: Clean
if: always()
run: make docker-clean
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,26 +83,35 @@ jobs:
fail-fast: false
matrix:
test: [litmus-1, litmus-2]
storage: ["eosclient"]
uses: ./.github/workflows/compose.yml
with:
test: ${{ matrix.test }}
storage: ${{ matrix.storage }}
acceptance-1:
needs:
- docker-revad-eos
strategy:
fail-fast: false
matrix:
storage: ["eosclient"]
uses: ./.github/workflows/compose.yml
with:
test: acceptance-1
submodules: true
storage: ${{ matrix.storage }}
acceptance-2:
needs:
- docker-revad-eos
strategy:
fail-fast: false
matrix:
part: [1, 2, 3, 4, 5, 6]
storage: ["eosclient"]
uses: ./.github/workflows/compose.yml
with:
test: acceptance-2
submodules: true
parts: 6
part: ${{ matrix.part }}
storage: ${{ matrix.storage }}
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export REVAD_IMAGE ?= revad-eos
export EOS_FULL_IMAGE ?= eos-full
export PARTS ?= 1
export PART ?= 1
export STORAGE_DRIVER ?= eosclient

.PHONY: $(TEST)
$(TEST): docker-eos-full-tests docker-revad-eos
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
volumes:
- ./eos-storage/scripts:/scripts
environment:
INIT_SCRIPT: /scripts/eosbinary-init.sh
INIT_SCRIPT: /scripts/${STORAGE_DRIVER}-init.sh
litmus:
image: registry.cern.ch/docker.io/owncloud/litmus:latest
environment:
Expand Down

0 comments on commit f528392

Please sign in to comment.