Skip to content

Commit

Permalink
test: fix hydra tests on master (#3737)
Browse files Browse the repository at this point in the history
  • Loading branch information
hperl authored Feb 5, 2024
1 parent 1d43d22 commit 12166b4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ jobs:
-e URLS_SELF_ISSUER=http://localhost:4444/ \
-e URLS_LOGIN=http://localhost:4499/login \
-e URLS_CONSENT=http://localhost:4499/consent \
oryd/hydra:v2.0.2 serve all --dev
-e LOG_LEAK_SENSITIVE_VALUES=true \
-e SECRETS_SYSTEM=someverylongsecretthatis32byteslong \
oryd/hydra:v2.2.0@sha256:6c0f9195fe04ae16b095417b323881f8c9008837361160502e11587663b37c09 serve all --dev
docker start hydra
docker logs -f hydra &> /tmp/hydra.log &
name: Start Hydra
Expand Down
5 changes: 4 additions & 1 deletion selfservice/strategy/oidc/strategy_helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,15 @@ func newHydra(t *testing.T, subject *string, claims *idTokenClaims, scope *[]str
require.NoError(t, err)
hydra, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "oryd/hydra",
Tag: "v2.0.2",
// Keep tag in sync with the version in ci.yaml
Tag: "v2.2.0@sha256:6c0f9195fe04ae16b095417b323881f8c9008837361160502e11587663b37c09",
Env: []string{
"DSN=memory",
fmt.Sprintf("URLS_SELF_ISSUER=http://localhost:%d/", publicPort),
"URLS_LOGIN=" + hydraIntegrationTSURL + "/login",
"URLS_CONSENT=" + hydraIntegrationTSURL + "/consent",
"LOG_LEAK_SENSITIVE_VALUES=true",
"SECRETS_SYSTEM=someverylongsecretthatis32byteslong",
},
Cmd: []string{"serve", "all", "--dev"},
ExposedPorts: []string{"4444/tcp", "4445/tcp"},
Expand Down
3 changes: 2 additions & 1 deletion selfservice/strategy/password/op_helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ func newHydra(t *testing.T, loginUI string, consentUI string) (hydraAdmin string

hydraResource, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "oryd/hydra",
Tag: "v2.2.0",
// Keep tag in sync with the version in ci.yaml
Tag: "v2.2.0@sha256:6c0f9195fe04ae16b095417b323881f8c9008837361160502e11587663b37c09",
Env: []string{
"DSN=memory",
fmt.Sprintf("URLS_SELF_ISSUER=http://127.0.0.1:%d/", publicPort),
Expand Down

0 comments on commit 12166b4

Please sign in to comment.