Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benakamoorthi@fastmail.fm>2014-03-11 00:08:07 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-03-11 00:08:07 +0400
commit4d5cdeee4f71ec5a57112634760b221aa7c859fd (patch)
tree56e27065efbf8da2b82b08fa4127c8586cc88f5f /tests/travis
parent498153d5bc60dc0420dd0fbc6eb3495c57c2a5fc (diff)
Tweak upload artifact script for plugin artifacts.
Diffstat (limited to 'tests/travis')
-rwxr-xr-xtests/travis/upload_artifacts.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/travis/upload_artifacts.sh b/tests/travis/upload_artifacts.sh
index f3418f360a..5d22540801 100755
--- a/tests/travis/upload_artifacts.sh
+++ b/tests/travis/upload_artifacts.sh
@@ -14,13 +14,17 @@ then
else
if [ "$TEST_SUITE" = "UITests" ];
then
- url_base="http://builds-artifacts.piwik.org/upload.php?auth_key=$ARTIFACTS_PASS&build_id=$TRAVIS_JOB_NUMBER&branch=ui-tests.$TRAVIS_BRANCH"
+ branch_name="ui-tests.$TRAVIS_BRANCH"
+ url_base="http://builds-artifacts.piwik.org/upload.php?auth_key=$ARTIFACTS_PASS&build_id=$TRAVIS_JOB_NUMBER"
if [ -n "$PLUGIN_NAME" ];
then
- url_base="$url_base.$PLUGIN_NAME&protected=1"
+ branch_name="$branch_name.$PLUGIN_NAME"
+ url_base="$url_base&protected=1"
fi
+ url_base="$url_base&branch=$branch_name"
+
echo "Uploading artifacts for $TEST_SUITE..."
if [ -n "$PLUGIN_NAME" ];
@@ -42,7 +46,7 @@ else
tar -cjf screenshot-diffs.tar.bz2 screenshot-diffs
curl -X POST --data-binary @screenshot-diffs.tar.bz2 "$url_base&artifact_name=screenshot-diffs"
- echo "View UI failures (if any) here: http://builds-artifacts.piwik.org/ui-tests.master/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
+ echo "View UI failures (if any) here: http://builds-artifacts.piwik.org/$branch_name/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html"
fi
else
echo "No artifacts for $TEST_SUITE tests."