From 9bb5b08015361ad02b9d748111cd5905bbc3691e Mon Sep 17 00:00:00 2001
From: Miquel Simon <msimonma@redhat.com>
Date: Wed, 21 Dec 2022 08:15:38 +0100
Subject: [PATCH] Added Oracle to Legacy Store IT. (#16097)

---
 .github/workflows/ci.yml                            | 6 +++---
 testsuite/integration-arquillian/pom.xml            | 6 +++---
 testsuite/integration-arquillian/tests/base/pom.xml | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 470802a528..30e57c08f9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
             PROJECTS="$PROJECTS$SEP$i"
             SEP=","
           done
-          
+
           ./mvnw test -nsu -B -pl "$PROJECTS" -am
 
       - name: Upload JVM Heapdumps
@@ -199,7 +199,7 @@ jobs:
           # For PRs, run only PostgreSQL, on branches and nightly runs run all databases
           if [ "${{ github.event_name }}" == "pull_request" ]; then
             echo 'db=["chm", "hot-rod", "jpa-postgres"]' >> $GITHUB_OUTPUT
-          else 
+          else
             echo 'db=["chm", "hot-rod", "jpa-postgres", "jpa-cockroach"]' >> $GITHUB_OUTPUT
           fi
     outputs:
@@ -253,7 +253,7 @@ jobs:
     timeout-minutes: 45
     strategy:
       matrix:
-        db: [postgres, mysql] # 'mariadb' is not always shutting down, 'mssql', 'oracle11g' containers not available
+        db: [postgres, mysql, oracle] # 'mariadb' is not always shutting down, 'mssql' container not available yet
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 47b16c1531..bbe6828fde 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -587,9 +587,9 @@
             </properties>
         </profile>
         <profile>
-            <id>db-oracle11g</id>
+            <id>db-oracle</id>
             <properties>
-                <docker.database.image>oracle/database:11.2.0.2-xe</docker.database.image>
+                <docker.database.image>docker.io/gvenzl/oracle-xe:21-slim-faststart</docker.database.image>
                 <docker.database.port>1521</docker.database.port>
                 <docker.database.shmsize>1073741824</docker.database.shmsize>
                 <docker.database.skip>false</docker.database.skip>
@@ -606,7 +606,7 @@
                 <keycloak.map.storage.connectionsJpa.user>${keycloak.connectionsJpa.user}</keycloak.map.storage.connectionsJpa.user>
                 <keycloak.map.storage.connectionsJpa.password>${keycloak.connectionsJpa.password}</keycloak.map.storage.connectionsJpa.password>
 
-                <docker.database.postStart>bash -c while\ !\ sqlplus\ -L\ SYS/sa@localhost/XE\ AS\ SYSDBA\ &lt;&lt;&lt;\ $'CREATE\ USER\ ${keycloak.connectionsJpa.user}\ IDENTIFIED\ BY\ ${keycloak.connectionsJpa.password};\n\ GRANT\ CONNECT,\ RESOURCE,\ DBA,\ GRANT\ ANY\ PRIVILEGE,\ UNLIMITED\ TABLESPACE\ TO\ ${keycloak.connectionsJpa.user};\n';\ do\ sleep\ 5;\ done</docker.database.postStart>
+                <docker.database.postStart>bash -c while\ !\ sqlplus\ -L\ SYS/sa@localhost/XE\ AS\ SYSDBA\ &lt;&lt;&lt;\ $'alter\ session\ set\ \"_ORACLE_SCRIPT\"=true;\n\ CREATE\ USER\ ${keycloak.connectionsJpa.user}\ IDENTIFIED\ BY\ ${keycloak.connectionsJpa.password};\n\ GRANT\ CONNECT,\ RESOURCE,\ DBA,\ GRANT\ ANY\ PRIVILEGE,\ UNLIMITED\ TABLESPACE\ TO\ ${keycloak.connectionsJpa.user};\n';\ do\ sleep\ 5;\ done</docker.database.postStart>
                 <!-- JDBC properties point to "default" JDBC driver for the particular DB -->
                 <!-- For EAP testing, it is recommended to override those with system properties pointing to GAV of more appropriate JDBC driver -->
                 <!-- for the particular EAP version -->
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 89bff77c5a..0cc6dabcf7 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -359,7 +359,7 @@
 
                                             <!-- Oracle -->
                                             <ORACLE_SID>${keycloak.connectionsJpa.database}</ORACLE_SID>
-                                            <ORACLE_PWD>sa</ORACLE_PWD>
+                                            <ORACLE_PASSWORD>sa</ORACLE_PASSWORD>
                                         </env>
                                         <cmd>${docker.database.cmd}</cmd>
                                         <wait>