From 7f070f3fb0661ae8fab80b910855c638a845d697 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 22:44:52 -0700
Subject: [PATCH 01/11] Testing Docker init with volumes

---
 .travis.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35b4955..c3c3dc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,24 +5,18 @@ matrix:
   include:
     - os: linux
       dist: trusty
-    - os: osx
   fast_finish: true
 
 env:
   global:
     - CC_ENV=travis-ci
+    - CC_PASSWORD=manage123
 
-  # matrix:
-  #   - CC_BOOT=default
+services:
+  - docker
 
 before_install:
-  - antcc/bootstrap/install.sh
-  - . $HOME/.bash_profile
-
+  - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+  
 script:
-  - antcc boot -Daccept.license=true
-  - antcc up test
-
-cache:
-  directories:
-    - $HOME/Downloads
+  - docker-compose run --rm init

From 425e53c6697bb85f8d544cea3f4e4561e0f29718 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 22:50:35 -0700
Subject: [PATCH 02/11] Redirecting build.dir to /tmp

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index db8dfae..4dce810 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,6 @@ services:
       - EMPOWER_USR
       - EMPOWER_PSW
       - CC_PASSWORD
-    command: ant up test clean
+    command: ant up test clean -Dbuild.dir=/tmp/build
     depends_on:
       - cc

From a26acab622d9f599ec7fe90873c1a6c3f98aea98 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 22:51:17 -0700
Subject: [PATCH 03/11] Redirecting antcc build to ~/antcc/build

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4dce810..09250cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,6 @@ services:
       - EMPOWER_USR
       - EMPOWER_PSW
       - CC_PASSWORD
-    command: ant up test clean -Dbuild.dir=/tmp/build
+    command: ant up test clean -Dbuild.dir=${user.home}/antcc/build
     depends_on:
       - cc

From 738212dda472b34c55655ff5037bae47e7adacf9 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 22:53:19 -0700
Subject: [PATCH 04/11] User shell var instead

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 09250cc..62f11b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,6 @@ services:
       - EMPOWER_USR
       - EMPOWER_PSW
       - CC_PASSWORD
-    command: ant up test clean -Dbuild.dir=${user.home}/antcc/build
+    command: ant up test clean -Dbuild.dir=$HOME/.antcc/build
     depends_on:
       - cc

From a34a4794c6a88711fd554ef526d46c7b4359a7de Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 22:54:24 -0700
Subject: [PATCH 05/11] Use $HOME/.sag/build

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 62f11b2..f875918 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,6 @@ services:
       - EMPOWER_USR
       - EMPOWER_PSW
       - CC_PASSWORD
-    command: ant up test clean -Dbuild.dir=$HOME/.antcc/build
+    command: ant up test clean -Dbuild.dir=$HOME/.sag/build
     depends_on:
       - cc

From 0494e4360dca6862398e9e5d1bddfd6191c8f9e6 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 23:07:39 -0700
Subject: [PATCH 06/11] Using /tmp

---
 .travis.yml        | 3 +++
 docker-compose.yml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c3c3dc1..b91927f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,3 +20,6 @@ before_install:
   
 script:
   - docker-compose run --rm init
+  - docker-compose down
+  - docker-compose up -d cc
+  - docker-compose run --rm init ant test -Dbuild.dir=/tmp/build
diff --git a/docker-compose.yml b/docker-compose.yml
index f875918..4dce810 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,6 @@ services:
       - EMPOWER_USR
       - EMPOWER_PSW
       - CC_PASSWORD
-    command: ant up test clean -Dbuild.dir=$HOME/.sag/build
+    command: ant up test clean -Dbuild.dir=/tmp/build
     depends_on:
       - cc

From 6973b395968fc50c0a7a78037003327f3b1d06b9 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 23:16:47 -0700
Subject: [PATCH 07/11] Fixes for build.dir

---
 antcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antcc b/antcc
index 83e7a62..006ccf5 160000
--- a/antcc
+++ b/antcc
@@ -1 +1 @@
-Subproject commit 83e7a621584eeb8299eebe2febefe4b0d758bb9f
+Subproject commit 006ccf5e127f383731750beadb31a9bc07f1a35a

From 2699a708769f2a4692aac2a59d9f7869cdec7e11 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 23:25:12 -0700
Subject: [PATCH 08/11] Wait for CC before test

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b91927f..f6248e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,4 @@ script:
   - docker-compose run --rm init
   - docker-compose down
   - docker-compose up -d cc
-  - docker-compose run --rm init ant test -Dbuild.dir=/tmp/build
+  - docker-compose run --rm init ant waitcc test -Dbuild.dir=/tmp/build

From 8a816b80ebce21de0e337466507f2e1827b995cf Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 23:36:03 -0700
Subject: [PATCH 09/11] fixed build.dir resolution

---
 antcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/antcc b/antcc
index 006ccf5..af7e06b 160000
--- a/antcc
+++ b/antcc
@@ -1 +1 @@
-Subproject commit 006ccf5e127f383731750beadb31a9bc07f1a35a
+Subproject commit af7e06b53d727028bce72c2cf2f94e984f651a5d

From 1be29a1e6157215d34c41ec065dd7447e69bc1ef Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 23:44:09 -0700
Subject: [PATCH 10/11] Use ${build.dir}

---
 tests/test-masters.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test-masters.xml b/tests/test-masters.xml
index 64e04c7..52b3cac 100644
--- a/tests/test-masters.xml
+++ b/tests/test-masters.xml
@@ -5,20 +5,20 @@
 
 	<target name="test-repos-master-prods" depends="sagenvInit" description="Verify SAG product repositories">
 		<property file="${env.properties}"/>
-		<cc command="list repository products" expectedvalues="${release}" format="csv" output="build/logs/product-repos.csv" wait="5" />
+		<cc command="list repository products" expectedvalues="${release}" format="csv" output="${build.dir}/logs/product-repos.csv" wait="5" />
 	</target>
 
 	<!-- <target name="test-repos-master-prods-listing" depends="sagenvInit" description="Verify SAG product repository listing">
 		<property file="${env.properties}"/>
-		<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="build/logs/products.csv" wait="240" />
+		<cc command="list repository products content webMethods-${release}" expectedvalues="SPM" format="csv" output="${build.dir}/logs/products.csv" wait="240" />
 	</target> -->
 
 	<target name="test-repos-master-fixes" depends="sagenvInit" description="Verify SAG fix repositories">
-		<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="build/logs/fix-repos.csv" wait="5" />
+		<cc command="list repository fixes" expectedvalues="Empower" format="csv" output="${build.dir}/logs/fix-repos.csv" wait="5" />
 	</target>
 
 	<target name="test-repos-master-fixes-listing" depends="sagenvInit" description="Verify SAG fix repository listing">
-		<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="build/logs/fixes.csv" />
+		<cc command="list repository fixes content Empower" expectedvalues="SPM" format="csv" output="${build.dir}/logs/fixes.csv" />
 	</target>
 	
 </project>

From 10aa02c808da26fa961e1d99ef00d6db7586e806 Mon Sep 17 00:00:00 2001
From: "Pogrebnyak, Sergei" <Sergei.Pogrebnyak@softwareag.com>
Date: Wed, 24 Oct 2018 23:56:42 -0700
Subject: [PATCH 11/11] Docker and non-docker tests

---
 .travis.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f6248e6..be00cc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,19 @@ services:
 
 before_install:
   - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
-  
+
 script:
   - docker-compose run --rm init
   - docker-compose down
   - docker-compose up -d cc
   - docker-compose run --rm init ant waitcc test -Dbuild.dir=/tmp/build
+  - docker-compose down
+
+  - antcc/bootstrap/install.sh
+  - . $HOME/.bash_profile	  
+  - antcc boot -Daccept.license=true
+  - antcc up test stopcc
+
+cache:
+  directories:	
+    - $HOME/Downloads