Skip to content

Commit 8c860c2

Browse files
committed
Allow specifying custom KurrentDB images
- Provide kurrentdb-image and kurrentdb-registry to use a custom KurrentDB image rather than the ones in the KURRENTDB_DOCKER_IMAGES variable
1 parent 5980772 commit 8c860c2

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed

.github/workflows/base.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,25 @@ on:
44
workflow_call:
55
inputs:
66
kurrentdb-tag:
7+
description: The docker tag to use. If kurrentdb-image and kurrentdb-registry are empty, the action will use the values in the KURRENTDB_DOCKER_IMAGES variable (ci, lts, previous-lts).
78
required: true
89
type: string
10+
kurrentdb-image:
11+
description: The docker image to use. Leave this empty to use the image in the KURRENTDB_DOCKER_IMAGES variable.
12+
required: false
13+
type: string
14+
kurrentdb-registry:
15+
description: The docker registry to use. Leave this empty to use the registry in the KURRENTDB_DOCKER_IMAGES variable.
16+
required: false
17+
type: string
918
test:
19+
description: Which test to run.
1020
required: true
1121
type: string
1222
env:
13-
KURRENTDB_TAG: ${{ fromJSON(vars.KURRENTDB_DOCKER_IMAGES)[inputs.kurrentdb-tag].tag}}
14-
KURRENTDB_IMAGE: ${{ fromJSON(vars.KURRENTDB_DOCKER_IMAGES)[inputs.kurrentdb-tag].image}}
15-
KURRENTDB_REGISTRY: ${{ fromJSON(vars.KURRENTDB_DOCKER_IMAGES)[inputs.kurrentdb-tag].registry}}
23+
KURRENTDB_TAG: ${{inputs.kurrentdb-tag }}
24+
KURRENTDB_IMAGE: ${{ inputs.kurrentdb-image || fromJSON(vars.KURRENTDB_DOCKER_IMAGES)[inputs.kurrentdb-tag].image }}
25+
KURRENTDB_REGISTRY: ${{ inputs.kurrentdb-registry || fromJSON(vars.KURRENTDB_DOCKER_IMAGES)[inputs.kurrentdb-tag].registry }}
1626
jobs:
1727
test:
1828
timeout-minutes: 20

.github/workflows/dispatch-ee.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ on:
44
workflow_dispatch:
55
inputs:
66
kurrentdb-tag:
7-
description: "KurrentDB tag"
7+
description: "The KurrentDB docker tag to use. If kurrentdb-image and kurrentdb-registry are empty, the action will use the values in the KURRENTDB_DOCKER_IMAGES variable (ci, lts, previous-lts)."
88
required: true
9-
type: choice
10-
options:
11-
- ci
12-
- lts
13-
- previous-lts
9+
type: string
10+
kurrentdb-image:
11+
description: "The KurrentDB docker image to test against. Leave this empty to use the image in the KURRENTDB_DOCKER_IMAGES variable"
12+
required: false
13+
type: string
14+
kurrentdb-registry:
15+
description: "The docker registry containing the KurrentDB docker image. Leave this empty to use the registry in the KURRENTDB_DOCKER_IMAGES variable."
16+
required: false
17+
type: string
1418
jobs:
1519
test:
1620
uses: ./.github/workflows/base.yml
@@ -21,5 +25,7 @@ jobs:
2125
name: Test (${{ inputs.kurrentdb-tag }})
2226
with:
2327
kurrentdb-tag: ${{ inputs.kurrentdb-tag }}
28+
kurrentdb-image: ${{ inputs.kurrentdb-image }}
29+
kurrentdb-registry: ${{ inputs.kurrentdb-registry }}
2430
test: ${{ matrix.test }}
2531
secrets: inherit

0 commit comments

Comments
 (0)