Skip to content

Make selenium test images configurable (backport #14770) #14776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

Make selenium test images configurable (backport #14770) #14776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion selenium/bin/components/devkeycloak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

KEYCLOAK_DOCKER_IMAGE=quay.io/keycloak/keycloak:20.0
KEYCLOAK_DOCKER_IMAGE=${KEYCLOAK_DOCKER_IMAGE:-quay.io/keycloak/keycloak:20.0}

init_devkeycloak() {
DEVKEYCLOAK_CONFIG_PATH=${DEVKEYCLOAK_CONFIG_PATH:-multi-oauth/devkeycloak}
Expand Down
3 changes: 1 addition & 2 deletions selenium/bin/components/devkeycloak-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

HTTPD_DOCKER_IMAGE=httpd:latest
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_devkeycloak-proxy() {
if docker ps | grep devkeycloak-proxy &> /dev/null; then
Expand Down
3 changes: 1 addition & 2 deletions selenium/bin/components/forward-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

HTTPD_DOCKER_IMAGE=httpd:latest
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_forward-proxy() {
if docker ps | grep forward-proxy &> /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion selenium/bin/components/keycloak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

KEYCLOAK_DOCKER_IMAGE=quay.io/keycloak/keycloak:20.0
KEYCLOAK_DOCKER_IMAGE=${KEYCLOAK_DOCKER_IMAGE:-quay.io/keycloak/keycloak:20.0}

ensure_keycloak() {
if docker ps | grep keycloak &> /dev/null; then
Expand Down
4 changes: 3 additions & 1 deletion selenium/bin/components/mock-auth-backend-http
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ ensure_mock-auth-backend-http() {
init_mock-auth-backend-http() {
AUTH_BACKEND_HTTP_BASEURL=${AUTH_BACKEND_HTTP_BASEURL:-http://localhost:8888}
AUTH_BACKEND_HTTP_DIR=${TEST_CASES_DIR}/mock-auth-backend-http
MOCKSERVER_DOCKER_IMAGE=${MOCKSERVER_DOCKER_IMAGE:-mockserver/mockserver}

print "> AUTH_BACKEND_HTTP_BASEURL: ${AUTH_BACKEND_HTTP_BASEURL}"
print "> AUTH_BACKEND_HTTP_DIR: ${AUTH_BACKEND_HTTP_DIR}"
print "> MOCKSERVER_DOCKER_IMAGE: ${MOCKSERVER_DOCKER_IMAGE}"

}
start_mock-auth-backend-http() {
Expand All @@ -28,7 +30,7 @@ start_mock-auth-backend-http() {
--publish 8888:1080 \
--env MOCKSERVER_INITIALIZATION_JSON_PATH="/config/defaultExpectations.json" \
-v ${AUTH_BACKEND_HTTP_DIR}:/config \
mockserver/mockserver
${MOCKSERVER_DOCKER_IMAGE}

wait_for_url $AUTH_BACKEND_HTTP_BASEURL/ready
end "mock-auth-backend-http is ready"
Expand Down
4 changes: 3 additions & 1 deletion selenium/bin/components/mock-auth-backend-ldap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ ensure_mock-auth-backend-ldap() {
}
init_mock-auth-backend-ldap() {
AUTH_BACKEND_LDAP_DIR=${TEST_CONFIG_DIR}/mock-auth-backend-ldap
OPENLDAP_DOCKER_IMAGE=${OPENLDAP_DOCKER_IMAGE:-osixia/openldap:1.5.0}

print "> AUTH_BACKEND_LDAP_DIR: ${AUTH_BACKEND_LDAP_DIR}"
print "> OPENLDAP_DOCKER_IMAGE: ${OPENLDAP_DOCKER_IMAGE}"
}
start_mock-auth-backend-ldap() {
begin "Starting mock-auth-backend-ldap ..."
Expand All @@ -28,7 +30,7 @@ start_mock-auth-backend-ldap() {
--publish 389:389 \
--publish 636:636 \
-v ${AUTH_BACKEND_LDAP_DIR}:/config \
osixia/openldap:1.5.0
${OPENLDAP_DOCKER_IMAGE}

wait_for_message mock-auth-backend-ldap "starting"
docker exec mock-auth-backend-ldap ldapadd \
Expand Down
2 changes: 1 addition & 1 deletion selenium/bin/components/prodkeycloak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

KEYCLOAK_DOCKER_IMAGE=quay.io/keycloak/keycloak:20.0
KEYCLOAK_DOCKER_IMAGE=${KEYCLOAK_DOCKER_IMAGE:-quay.io/keycloak/keycloak:20.0}

ensure_prodkeycloak() {
if docker ps | grep prodkeycloak &> /dev/null; then
Expand Down
5 changes: 2 additions & 3 deletions selenium/bin/components/prodkeycloak-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

HTTPD_DOCKER_IMAGE=httpd:latest
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_prodkeycloak-proxy() {
if docker ps | grep prodkeycloak-proxy &> /dev/null; then
Expand All @@ -17,7 +16,7 @@ init_prodkeycloak-proxy() {
print "> PROXY_HOSTNAME: ${PROXY_HOSTNAME}"
print "> PROXY_PORT: ${PROXY_PORT}"

}
print "> HTTPD_DOCKER_IMAGE: ${HTTPD_DOCKER_IMAGE}"

start_prodkeycloak-proxy() {
begin "Starting prodkeycloak-proxy ..."
Expand Down
3 changes: 1 addition & 2 deletions selenium/bin/components/proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

HTTPD_DOCKER_IMAGE=httpd:latest
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_proxy() {
if docker ps | grep proxy &> /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion selenium/bin/components/uaa
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

UAA_DOCKER_IMAGE=cloudfoundry/uaa:75.21.0
UAA_DOCKER_IMAGE=${UAA_DOCKER_IMAGE:-cloudfoundry/uaa:75.21.0}

ensure_uaa() {
if docker ps | grep uaa &> /dev/null; then
Expand Down
Loading