From 9c51d8eedcc32cadf2c8dc9abacd48b014c4b48d Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Mon, 18 Nov 2019 09:00:44 +1100
Subject: [PATCH] Specify keycloak version in tests

---
 build-parent/pom.xml                             | 4 ++++
 ci-templates/native-build-steps.yaml             | 2 +-
 integration-tests/keycloak-authorization/pom.xml | 2 +-
 integration-tests/oidc-code-flow/pom.xml         | 2 +-
 integration-tests/oidc/pom.xml                   | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 5efc8f12098d7..768a32d5591d5 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -76,6 +76,10 @@
         <findbugs.version>3.0.2</findbugs.version>
         <jsoup.version>1.11.3</jsoup.version>
         <wagon-provider-api.version>3.3.3</wagon-provider-api.version>
+
+        <!-- The image to use for tests that run Keycloak -->
+        <!-- IMPORTANT: If this is changed you must also update native-build-steps.yaml to match the version -->
+        <keycloak.docker.image>quay.io/keycloak/keycloak:7.0.1</keycloak.docker.image>
     </properties>
 
     <dependencyManagement>
diff --git a/ci-templates/native-build-steps.yaml b/ci-templates/native-build-steps.yaml
index 379d994768448..68c9206056df9 100644
--- a/ci-templates/native-build-steps.yaml
+++ b/ci-templates/native-build-steps.yaml
@@ -36,7 +36,7 @@ jobs:
       - script: docker run --rm --publish 8000:8000 --name build-dynamodb -d amazon/dynamodb-local:1.11.477
         displayName: 'start dynamodb'
     - ${{ if eq(parameters.keycloak, 'true') }}:
-        - script: docker run --rm --publish 8180:8080 --name build-keycloak  -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e JAVA_OPTS="-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dkeycloak.profile.feature.upload_scripts=enabled" -d quay.io/keycloak/keycloak
+        - script: docker run --rm --publish 8180:8080 --name build-keycloak  -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e JAVA_OPTS="-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dkeycloak.profile.feature.upload_scripts=enabled" -d quay.io/keycloak/keycloak:7.0.1
           displayName: 'start keycloak'
     - ${{ if eq(parameters.mysql, 'true') }}:
       - bash: |
diff --git a/integration-tests/keycloak-authorization/pom.xml b/integration-tests/keycloak-authorization/pom.xml
index 3719a82bc7917..76014dfccd2ac 100644
--- a/integration-tests/keycloak-authorization/pom.xml
+++ b/integration-tests/keycloak-authorization/pom.xml
@@ -193,7 +193,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>quay.io/keycloak/keycloak</name>
+                                    <name>${keycloak.docker.image}</name>
                                     <alias>quarkus-test-keycloak</alias>
                                     <run>
                                         <ports>
diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml
index 855892514a628..06bf52a0dfb67 100644
--- a/integration-tests/oidc-code-flow/pom.xml
+++ b/integration-tests/oidc-code-flow/pom.xml
@@ -218,7 +218,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>quay.io/keycloak/keycloak</name>
+                                    <name>${keycloak.docker.image}</name>
                                     <alias>quarkus-test-keycloak</alias>
                                     <run>
                                         <ports>
diff --git a/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml
index 15595eddf7acd..b27ce1870a00a 100644
--- a/integration-tests/oidc/pom.xml
+++ b/integration-tests/oidc/pom.xml
@@ -199,7 +199,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>quay.io/keycloak/keycloak</name>
+                                    <name>${keycloak.docker.image}</name>
                                     <alias>quarkus-test-keycloak</alias>
                                     <run>
                                         <ports>