From 36736972a5118eac98e216aae55724e588303ff1 Mon Sep 17 00:00:00 2001 From: Shay Tsadok Date: Tue, 26 Jan 2016 13:37:00 +0200 Subject: [PATCH] better artifact hierarchy --- circle.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index 1e107b6..42e588b 100644 --- a/circle.yml +++ b/circle.yml @@ -20,20 +20,20 @@ test: - docker run --name jshint-runner gaiaadm/result-processing grunt jshint # run unit tests on pure Node.js image - docker run --name unit-test-runner gaiaadm/result-processing grunt unit - - docker cp unit-test-runner:/src/unit-test-results.xml $CIRCLE_TEST_REPORTS/nodejs - - docker cp unit-test-runner:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/nodejs + - docker cp unit-test-runner:/src/unit-test-results.xml $CIRCLE_TEST_REPORTS/nodejs/unit-test-results.xml + - docker cp unit-test-runner:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/nodejs/unit-test-results.txt # run system tests on pure Node.js image - docker run -e AMQ_USER="admin" -e AMQ_SERVER="rabbitmq:5672" --link rabbitmq:rabbitmq --name system-test-runner gaiaadm/result-processing 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 + - docker cp system-test-runner:/src/system-test-results.xml $CIRCLE_TEST_REPORTS/nodejs/system-test-results.xml + - docker cp system-test-runner:/src/system-test-results.txt $CIRCLE_ARTIFACTS/nodejs/system-test-results.txt # run unit tests on Python image - docker run --name unit-test-runner-python gaiaadm/result-processing:latest-python grunt unit - - docker cp unit-test-runner-python:/src/unit-test-results.xml $CIRCLE_TEST_REPORTS/python - - docker cp unit-test-runner-python:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/python + - docker cp unit-test-runner-python:/src/unit-test-results.xml $CIRCLE_TEST_REPORTS/python/unit-test-results.xml + - docker cp unit-test-runner-python:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/python/unit-test-results.txt # run system tests on Python image - docker run -e AMQ_USER="admin" -e AMQ_SERVER="rabbitmq:5672" --link rabbitmq:rabbitmq --name system-test-runner-python gaiaadm/result-processing:latest-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 + - docker cp system-test-runner-python:/src/system-test-results.xml $CIRCLE_TEST_REPORTS/python/system-test-results.xml + - docker cp system-test-runner-python:/src/system-test-results.txt $CIRCLE_ARTIFACTS/python/system-test-results.txt deployment: continuous: branch: master