From 36736972a5118eac98e216aae55724e588303ff1 Mon Sep 17 00:00:00 2001 From: Shay Tsadok Date: Tue, 26 Jan 2016 13:37:00 +0200 Subject: [PATCH 1/4] 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 From 8d8d272f3a1999324730647cd8e715611e88b7f3 Mon Sep 17 00:00:00 2001 From: Shay Tsadok Date: Tue, 26 Jan 2016 13:49:05 +0200 Subject: [PATCH 2/4] try to fix system tests failure --- circle.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 42e588b..9119012 100644 --- a/circle.yml +++ b/circle.yml @@ -18,12 +18,17 @@ test: - docker run -d --name rabbitmq -e "RABBITMQ_PASS=admin" gaiaadm/rabbitmq; sleep 10 # run jshint - docker run --name jshint-runner gaiaadm/result-processing grunt jshint + # create artifact folders + - mkdir -p ./$CIRCLE_TEST_REPORTS/nodejs + - mkdir -p ./$CIRCLE_ARTIFACTS/nodejs + - mkdir -p ./$CIRCLE_TEST_REPORTS/python + - mkdir -p ./$CIRCLE_ARTIFACTS/python # 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/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 run -e AMQ_USER="admin" -e AMQ_PASSWORD="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/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 @@ -31,7 +36,7 @@ test: - 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 run -e AMQ_USER="admin" -e AMQ_PASSWORD="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/system-test-results.xml - docker cp system-test-runner-python:/src/system-test-results.txt $CIRCLE_ARTIFACTS/python/system-test-results.txt deployment: From c31b292681e06290d730c1b386c0445e5e55ea40 Mon Sep 17 00:00:00 2001 From: Shay Tsadok Date: Tue, 26 Jan 2016 13:59:28 +0200 Subject: [PATCH 3/4] try to fix artifact collection --- circle.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/circle.yml b/circle.yml index 9119012..bae5c84 100644 --- a/circle.yml +++ b/circle.yml @@ -19,26 +19,24 @@ test: # run jshint - docker run --name jshint-runner gaiaadm/result-processing grunt jshint # create artifact folders - - mkdir -p ./$CIRCLE_TEST_REPORTS/nodejs - - mkdir -p ./$CIRCLE_ARTIFACTS/nodejs - - mkdir -p ./$CIRCLE_TEST_REPORTS/python - - mkdir -p ./$CIRCLE_ARTIFACTS/python + - mkdir -p ./mocha-test-output/nodejs + - mkdir -p ./mocha-test-output/python # 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/unit-test-results.xml - - docker cp unit-test-runner:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/nodejs/unit-test-results.txt + - docker cp unit-test-runner:/src/unit-test-results.xml ./mocha-test-output/nodejs/unit-test-results.xml + - docker cp unit-test-runner:/src/unit-test-results.txt ./mocha-test-output/nodejs/unit-test-results.txt # run system tests on pure Node.js image - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="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/system-test-results.xml - - docker cp system-test-runner:/src/system-test-results.txt $CIRCLE_ARTIFACTS/nodejs/system-test-results.txt + - docker cp system-test-runner:/src/system-test-results.xml ./mocha-test-output/nodejs/system-test-results.xml + - docker cp system-test-runner:/src/system-test-results.txt ./mocha-test-output/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/unit-test-results.xml - - docker cp unit-test-runner-python:/src/unit-test-results.txt $CIRCLE_ARTIFACTS/python/unit-test-results.txt + - docker cp unit-test-runner-python:/src/unit-test-results.xml ./mocha-test-output/python/unit-test-results.xml + - docker cp unit-test-runner-python:/src/unit-test-results.txt ./mocha-test-output/python/unit-test-results.txt # run system tests on Python image - docker run -e AMQ_USER="admin" -e AMQ_PASSWORD="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/system-test-results.xml - - docker cp system-test-runner-python:/src/system-test-results.txt $CIRCLE_ARTIFACTS/python/system-test-results.txt + - docker cp system-test-runner-python:/src/system-test-results.xml ./mocha-test-output/python/system-test-results.xml + - docker cp system-test-runner-python:/src/system-test-results.txt ./mocha-test-output/python/system-test-results.txt deployment: continuous: branch: master From 47e0d945560666ca494ac76b0cee0b2c9a6a2363 Mon Sep 17 00:00:00 2001 From: Shay Tsadok Date: Tue, 26 Jan 2016 14:25:54 +0200 Subject: [PATCH 4/4] try to fix artifact collection --- circle.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/circle.yml b/circle.yml index bae5c84..3644bc2 100644 --- a/circle.yml +++ b/circle.yml @@ -18,25 +18,22 @@ test: - docker run -d --name rabbitmq -e "RABBITMQ_PASS=admin" gaiaadm/rabbitmq; sleep 10 # run jshint - docker run --name jshint-runner gaiaadm/result-processing grunt jshint - # create artifact folders - - mkdir -p ./mocha-test-output/nodejs - - mkdir -p ./mocha-test-output/python # 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 ./mocha-test-output/nodejs/unit-test-results.xml - - docker cp unit-test-runner:/src/unit-test-results.txt ./mocha-test-output/nodejs/unit-test-results.txt + - docker cp unit-test-runner:/src/unit-test-results.xml $CIRCLE_ARTIFACTS/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_PASSWORD="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 ./mocha-test-output/nodejs/system-test-results.xml - - docker cp system-test-runner:/src/system-test-results.txt ./mocha-test-output/nodejs/system-test-results.txt + - docker cp system-test-runner:/src/system-test-results.xml $CIRCLE_ARTIFACTS/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 ./mocha-test-output/python/unit-test-results.xml - - docker cp unit-test-runner-python:/src/unit-test-results.txt ./mocha-test-output/python/unit-test-results.txt + - docker cp unit-test-runner-python:/src/unit-test-results.xml $CIRCLE_ARTIFACTS/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_PASSWORD="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 ./mocha-test-output/python/system-test-results.xml - - docker cp system-test-runner-python:/src/system-test-results.txt ./mocha-test-output/python/system-test-results.txt + - docker cp system-test-runner-python:/src/system-test-results.xml $CIRCLE_ARTIFACTS/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