From 5a109cf816539a1e9ee85f33aebad8372a6c1fea Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 22 Jun 2016 08:45:17 -0700 Subject: [PATCH] travis: Skip development database setup in production tests. This saves about 20s on the runtime of the production build. --- provision.py | 14 ++++++++------ tools/travis/setup-production | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/provision.py b/provision.py index 260cd0f610..4d69893824 100644 --- a/provision.py +++ b/provision.py @@ -191,12 +191,14 @@ def main(): run(["sudo", "pg_createcluster", "-e", "utf8", "--start", POSTGRES_VERSION, "main"]) run(["sudo", "service", "redis-server", "restart"]) run(["sudo", "service", "memcached", "restart"]) - run(["scripts/setup/configure-rabbitmq"]) - run(["tools/setup/postgres-init-dev-db"]) - run(["tools/do-destroy-rebuild-database"]) - run(["tools/setup/postgres-init-test-db"]) - run(["tools/do-destroy-rebuild-test-database"]) - run(["python", "./manage.py", "compilemessages"]) + if '--production-travis' not in sys.argv: + # These won't be used anyway + run(["scripts/setup/configure-rabbitmq"]) + run(["tools/setup/postgres-init-dev-db"]) + run(["tools/do-destroy-rebuild-database"]) + run(["tools/setup/postgres-init-test-db"]) + run(["tools/do-destroy-rebuild-test-database"]) + run(["python", "./manage.py", "compilemessages"]) # Install the pinned version of npm. install_npm() # Run npm install last because it can be flaky, and that way one diff --git a/tools/travis/setup-production b/tools/travis/setup-production index 4271806468..af9e76b7e5 100755 --- a/tools/travis/setup-production +++ b/tools/travis/setup-production @@ -7,7 +7,7 @@ set -x # to conflicts over which version of postgres should be running. sudo apt-get remove postgresql-9.1 postgresql-9.2 postgresql-9.4 -y -python provision.py --travis +python provision.py --travis --production-travis cp -a tools/travis/success-http-headers.txt ~/ source /srv/zulip-venv/bin/activate ./tools/build-release-tarball travis