Refactoring.

eventuate-examples · Apr 9, 2018 · c946654 · c946654
1 parent 406382d
commit c946654
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,7 +19,7 @@ jobs:
             - ~/.gradle
             - ~/.m2
           key: eventuate-examples-java-customers-and-orders-{{ checksum "build.gradle" }}
-      - run: TERM=dumb ./build-and-test-all-eventuate-local.sh
+      - run: TERM=dumb ./build-and-test-all-eventuate-local-mysql.sh
       - run: TERM=dumb ./build-and-test-all.sh
       - run:
           name: Save test results

diff --git a/build-and-test-everything.sh b/build-and-test-everything.sh
@@ -1,19 +1,23 @@
-#! /bin/bash
+#! /bin/bash -e
 
 set -e
+set -o pipefail
 
-./gradlew clean
-
-#./build-and-test-all.sh
-
-./gradlew clean
-
+SCRIPTS="./build-and-test-all.sh
 ./build-and-test-all-eventuate-local-mysql.sh
+./build-and-test-all-eventuate-local-postgres-polling.sh
+./build-and-test-all-eventuate-local-postgres-wal.sh
+"
 
-./gradlew clean
+date > build-and-test-everything.log
 
-./build-and-test-all-eventuate-local-postgres-polling.sh
+for script in $SCRIPTS ; do
+    ./gradlew clean
+   echo '****************************************** Running' $script
+   date >> build-and-test-everything.log
+   echo '****************************************** Running' $script >> build-and-test-everything.log
 
-./gradlew clean
+   (cd $(dirname $script) ; ./$(basename $script) ) | tee -a build-and-test-everything.log
+done
 
-./build-and-test-all-eventuate-local-postgres-wal.sh
+echo 'Finished successfully!!!'
diff --git a/docker-compose-eventuate-local-mysql.yml b/docker-compose-eventuate-local-mysql.yml
@@ -30,7 +30,7 @@ services:
 
 
   cdcservice:
-    image: test-eventuate-local-java-new-cdc-mysql-service
+    image: eventuateio/eventuateio-local-new-cdc-service:0.18.0.RELEASE
     ports:
       - "8099:8080"
     links:

diff --git a/docker-compose-eventuate-local-postgres-polling.yml b/docker-compose-eventuate-local-postgres-polling.yml
@@ -29,7 +29,7 @@ services:
 
 
   cdcservice:
-    image: test-eventuate-local-java-new-cdc-mysql-service
+    image: eventuateio/eventuateio-local-new-cdc-service:0.18.0.RELEASE
     ports:
       - "8099:8080"
     links:

diff --git a/docker-compose-eventuate-local-postgres-wal.yml b/docker-compose-eventuate-local-postgres-wal.yml
@@ -29,7 +29,7 @@ services:
 
 
   cdcservice:
-    image: test-eventuate-local-java-new-cdc-mysql-service
+    image: eventuateio/eventuateio-local-new-cdc-service:0.18.0.RELEASE
     ports:
       - "8099:8080"
     links: