run unit tests outside of Docker build phase, since if tests fail the…

…n there is no image and results can't be collected

circle.yml

@@ -8,16 +8,20 @@ dependencies:
 test:
   override:
     - docker run -d -e RABBITMQ_PASS="mypass" --name rabbitmq gaiaadm/rabbitmq; sleep 10
-    # run system tests on pure Node.js image
-    - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="mypass" --link rabbitmq:amqserver --name system-test-runner gaiaadm/result-processing:$BUILD_TAG grunt system
+    # run unit tests on pure Node.js image
+    - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="mypass" --link rabbitmq:amqserver --name unit-test-runner gaiaadm/result-processing:$BUILD_TAG grunt unit
     - docker cp system-test-runner:/src/unit-test-results.xml $CIRCLE_TEST_REPORTS/nodejs
     - docker cp system-test-runner:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/nodejs
+    # run system tests on pure Node.js image
+    - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="mypass" --link rabbitmq:amqserver --name system-test-runner gaiaadm/result-processing:$BUILD_TAG grunt system
     - docker cp system-test-runner:/src/system-test-results.xml $CIRCLE_TEST_REPORTS/nodejs
     - docker cp system-test-runner:/src/system-test-results.txt $CIRCLE_ARTIFACTS/nodejs
-    # run system tests on Python image
-    - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="mypass" --link rabbitmq:amqserver --name system-test-runner-python gaiaadm/result-processing:$BUILD_TAG-python grunt system
+    # run unit tests on Python image
+    - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="mypass" --link rabbitmq:amqserver --name unit-test-runner-python gaiaadm/result-processing:$BUILD_TAG-python grunt unit
     - docker cp system-test-runner-python:/src/unit-test-results.xml $CIRCLE_TEST_REPORTS/python
     - docker cp system-test-runner-python:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/python
+    # run system tests on Python image
+    - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="mypass" --link rabbitmq:amqserver --name system-test-runner-python gaiaadm/result-processing:$BUILD_TAG-python grunt system
     - docker cp system-test-runner-python:/src/system-test-results.xml $CIRCLE_TEST_REPORTS/python
     - docker cp system-test-runner-python:/src/system-test-results.txt $CIRCLE_ARTIFACTS/python
 deployment:

distribution/release/nodejs/Dockerfile

@@ -13,6 +13,5 @@ RUN /tmp/setup.sh
 WORKDIR   /src
 
 RUN grunt jshint
-RUN grunt unit
 
 CMD ["node", "/src/server.js"]

distribution/release/python/Dockerfile

@@ -13,6 +13,5 @@ RUN /tmp/setup.sh
 WORKDIR   /src
 
 RUN grunt jshint
-RUN grunt unit
 
 CMD ["node", "/src/server.js"]