summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-11-09 10:43:21 -0500
committerMicah Anderson <micah@riseup.net>2017-11-09 11:55:30 -0500
commita2959d8696348220cc171da436c6703e1a2cb5fd (patch)
tree6e7032b08997d59d7efe31c007cffd6f7c1a1b83
parenta0eea43cbb93665d9d1ac96765d1abdf2a665d15 (diff)
CI: produce CI-useful output for soledad test
-rwxr-xr-xtests/platform-ci/ci-build.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/platform-ci/ci-build.sh b/tests/platform-ci/ci-build.sh
index 4c9a516c..2b665749 100755
--- a/tests/platform-ci/ci-build.sh
+++ b/tests/platform-ci/ci-build.sh
@@ -203,7 +203,7 @@ soledad_migration() {
if ! LEAP_CMD run 'systemctl stop soledad-server' vm
then fail
fi
- if ! LEAP_CMD run --stream '/usr/share/soledad-server/migration/0.9/migrate.py --verbose --log-file /var/log/leap/soledad_migration.log --do-migrate' vm
+ if ! LEAP_CMD run --stream '/usr/share/soledad-server/migration/0.9/migrate.py --log-file /dev/stdout --verbose --do-migrate | tee /var/log/leap/soledad_migration.log' vm
then fail
fi
if ! LEAP_CMD run 'systemctl start leap-mx' vm
@@ -257,9 +257,13 @@ upgrade_test() {
jq '.services = ["couchdb","soledad","mx","webapp","tor_relay","monitor"]' < nodes/${NAME}.json
deploy
+ # pre-migration test
+ test
+
# check for soledad migration, and run it if necessary
soledad_migration
+ # run the test again, this should succeed
test
cleanup