Skip to content

Commit 42ddd00

Browse files
committed
allow different storages to run in CI
1 parent b861139 commit 42ddd00

File tree

5 files changed

+13
-1
lines changed

5 files changed

+13
-1
lines changed

.github/workflows/compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ on:
1515
type: number
1616
part:
1717
type: number
18+
storage:
19+
type: string
1820

1921
jobs:
2022
compose:
@@ -35,6 +37,7 @@ jobs:
3537
REVAD_IMAGE: ${{ inputs.image }}
3638
PARTS: ${{ inputs.parts }}
3739
PART: ${{ inputs.part }}
40+
STORAGE_DRIVER: ${{ inputs.storage }}
3841
- name: Clean
3942
if: always()
4043
run: make docker-clean

.github/workflows/test.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,26 +83,34 @@ jobs:
8383
fail-fast: false
8484
matrix:
8585
test: [litmus-1, litmus-2]
86+
storage: ["eosclient"]
8687
uses: ./.github/workflows/compose.yml
8788
with:
8889
test: ${{ matrix.test }}
8990
acceptance-1:
9091
needs:
9192
- docker-revad-eos
93+
strategy:
94+
fail-fast: false
95+
matrix:
96+
storage: ["eosclient"]
9297
uses: ./.github/workflows/compose.yml
9398
with:
9499
test: acceptance-1
95100
submodules: true
101+
storage: ${{ matrix.storage }}
96102
acceptance-2:
97103
needs:
98104
- docker-revad-eos
99105
strategy:
100106
fail-fast: false
101107
matrix:
102108
part: [1, 2, 3, 4, 5, 6]
109+
storage: ["eosclient"]
103110
uses: ./.github/workflows/compose.yml
104111
with:
105112
test: acceptance-2
106113
submodules: true
107114
parts: 6
108115
part: ${{ matrix.part }}
116+
storage: ${{ matrix.storage }}

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export REVAD_IMAGE ?= revad-eos
8080
export EOS_FULL_IMAGE ?= eos-full
8181
export PARTS ?= 1
8282
export PART ?= 1
83+
export STORAGE_DRIVER ?= eosclient
8384

8485
.PHONY: $(TEST)
8586
$(TEST): docker-eos-full-tests docker-revad-eos

tests/docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
volumes:
3030
- ./eos-storage/scripts:/scripts
3131
environment:
32-
INIT_SCRIPT: /scripts/eosbinary-init.sh
32+
INIT_SCRIPT: /scripts/${STORAGE_DRIVER}-init.sh
3333
litmus:
3434
image: registry.cern.ch/docker.io/owncloud/litmus:latest
3535
environment:
File renamed without changes.

0 commit comments

Comments
 (0)