Skip to content

Commit e1e7b8e

Browse files
committed
Add SSP version matrix strategy for conformance tests
1 parent 49d0aa6 commit e1e7b8e

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/test.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ jobs:
208208

209209
conformance-suite:
210210
runs-on: ubuntu-latest
211+
strategy:
212+
fail-fast: false
213+
matrix:
214+
ssp-version: ["v2.3.7", "v2.4.2"]
211215
env:
212216
SUITE_BASE_URL: https://localhost.emobix.co.uk:8443
213217
VERSION: release-v5.1.35
@@ -240,7 +244,7 @@ jobs:
240244
working-directory: ./main
241245
# Must run after conformance suite since they share a docker network.
242246
run: |
243-
OIDC_VERSION=@dev docker compose -f docker/docker-compose.yml --project-directory . up -d --build
247+
SSP_VERSION=${{ matrix.ssp-version }} OIDC_VERSION=@dev docker compose -f docker/docker-compose.yml --project-directory . up -d --build
244248
sleep 30
245249
# while ! curl -skfail https://op.local.stack-dev.cirrusidentity.com/.well-known/openid-configuration >/dev/null; do sleep 2; done
246250
- name: Run Basic conformance tests

docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
ARG SSP_VERSION="v2.4.2"
12
#FROM cirrusid/simplesamlphp:v2.3.7
2-
FROM cicnavi/simplesamlphp:v2.4.2
3+
FROM cicnavi/simplesamlphp:${SSP_VERSION}
34

45
RUN apt-get update && apt-get install -y sqlite3
56
# Prepopulate the DB with items needed for testing

docker/docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ services:
1616
context: .
1717
dockerfile: docker/Dockerfile
1818
args:
19+
SSP_VERSION: "${SSP_VERSION}"
1920
OIDC_VERSION: "${OIDC_VERSION}"
2021
environment:
2122
- STAGINGCOMPOSERREPOS=oidc

0 commit comments

Comments
 (0)