From a56e16fdaa8eb8971118ff309f43b91e9b38be4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 12 Mar 2015 10:46:31 +0100
Subject: [PATCH 1/2] Oracle 11 XE is now fired up in a docker image - looks
 like we get back Oracle Testing on pull requests

---
 autotest.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 94d6317354..94808e3136 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -17,6 +17,7 @@ set -e
 #$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel
 DATABASENAME=oc_autotest$EXECUTOR_NUMBER
 DATABASEUSER=oc_autotest$EXECUTOR_NUMBER
+DATABASEHOST=localhost
 ADMINLOGIN=admin$EXECUTOR_NUMBER
 BASEDIR=$PWD
 
@@ -72,6 +73,11 @@ if [ -f config/config.php ] && [ ! -f config/config-autotest-backup.php ]; then
 fi
 
 function cleanup_config {
+	if [ ! -z "$DOCKER_CONTAINER_ID" ]; then
+		echo "Kill the docker $DOCKER_CONTAINER_ID"
+		docker rm -f $DOCKER_CONTAINER_ID
+	fi
+
 	cd "$BASEDIR"
 	# Restore existing config
 	if [ -f config/config-autotest-backup.php ]; then
@@ -117,13 +123,22 @@ function execute_tests {
 		dropdb -U $DATABASEUSER $DATABASENAME || true
 	fi
 	if [ "$1" == "oci" ] ; then
+		echo "Fire up the oracle docker"
+		DOCKER_CONTAINER_ID=`docker run -d wnameless/oracle-xe-11g`
+		DATABASEHOST=`docker inspect $DOCKER_CONTAINER_ID | grep IPAddress | cut -d '"' -f 4`
+
+		echo "Waiting 60 seconds for Oracle initialization ... "
+		sleep 60
+
 		echo "drop the database"
-		sqlplus -s -l / as sysdba <<EOF
+		echo "sqlplus -s -l system/oracle@//$DATABASEHOST:1521/xe"
+
+		sqlplus -s -l system/oracle@//$DATABASEHOST:1521/xe <<EOF
 			drop user $DATABASENAME cascade;
 EOF
 
 		echo "create the database"
-		sqlplus -s -l / as sysdba <<EOF
+		sqlplus -s -l system/oracle@//$DATABASEHOST:1521/xe <<EOF
 			create user $DATABASENAME identified by owncloud;
 			alter user $DATABASENAME default tablespace users
 			temporary tablespace temp
@@ -145,7 +160,7 @@ EOF
 
 	# trigger installation
 	echo "Installing ...."
-	./occ maintenance:install --database=$1 --database-name=$DATABASENAME --database-host=localhost --database-user=$DATABASEUSER --database-pass=owncloud --database-table-prefix=oc_ --admin-user=$ADMINLOGIN --admin-pass=admin --data-dir=$DATADIR
+	./occ maintenance:install --database=$1 --database-name=$DATABASENAME --database-host=$DATABASEHOST --database-user=$DATABASEUSER --database-pass=owncloud --database-table-prefix=oc_ --admin-user=$ADMINLOGIN --admin-pass=admin --data-dir=$DATADIR
 
 	#test execution
 	echo "Testing with $1 ..."

From d039e4fd254ef177cbe96245b76d823d4e1f6713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 20 Mar 2015 10:33:21 +0100
Subject: [PATCH 2/2] Now using a special docker where the database for testing
 is already available

---
 autotest.sh | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 94808e3136..6c2a61da0a 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -124,37 +124,13 @@ function execute_tests {
 	fi
 	if [ "$1" == "oci" ] ; then
 		echo "Fire up the oracle docker"
-		DOCKER_CONTAINER_ID=`docker run -d wnameless/oracle-xe-11g`
+		DOCKER_CONTAINER_ID=`docker run -d deepdiver/docker-oracle-xe-11g`
 		DATABASEHOST=`docker inspect $DOCKER_CONTAINER_ID | grep IPAddress | cut -d '"' -f 4`
 
 		echo "Waiting 60 seconds for Oracle initialization ... "
 		sleep 60
 
-		echo "drop the database"
-		echo "sqlplus -s -l system/oracle@//$DATABASEHOST:1521/xe"
-
-		sqlplus -s -l system/oracle@//$DATABASEHOST:1521/xe <<EOF
-			drop user $DATABASENAME cascade;
-EOF
-
-		echo "create the database"
-		sqlplus -s -l system/oracle@//$DATABASEHOST:1521/xe <<EOF
-			create user $DATABASENAME identified by owncloud;
-			alter user $DATABASENAME default tablespace users
-			temporary tablespace temp
-			quota unlimited on users;
-			grant create session
-			, create table
-			, create procedure
-			, create sequence
-			, create trigger
-			, create view
-			, create synonym
-			, alter session
-			to $DATABASENAME;
-			exit;
-EOF
-		DATABASEUSER=$DATABASENAME
+		DATABASEUSER=autotest
 		DATABASENAME='XE'
 	fi