From dee8de3b88a4b63d1369d4ccc00f2be37b57bea0 Mon Sep 17 00:00:00 2001 From: arpit551 Date: Mon, 20 Apr 2020 20:24:20 +0530 Subject: [PATCH] ci: Replaced travis with test suite while setting production setup on ci. --- tools/ci/production-helper | 8 ++++---- tools/ci/setup-production | 9 ++++----- tools/lib/provision.py | 10 +++++----- tools/lib/provision_inner.py | 10 +++++----- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/ci/production-helper b/tools/ci/production-helper index 5be37e3892..c09545d2c8 100755 --- a/tools/ci/production-helper +++ b/tools/ci/production-helper @@ -6,7 +6,7 @@ set -e set -x ZULIP_PATH=$(mktemp -d) -tar -xf zulip-server-travis.tar.gz -C "$ZULIP_PATH" --strip-components=1 +tar -xf zulip-server-test.tar.gz -C "$ZULIP_PATH" --strip-components=1 # Do an apt upgrade to start with an up-to-date machine APT_OPTIONS=(-o 'Dpkg::Options::=--force-confdef' -o 'Dpkg::Options::=--force-confold') @@ -22,12 +22,12 @@ service rabbitmq-server stop rm -rf /var/lib/rabbitmq/mnesia/ # Install Zulip -env TRAVIS=1 "$ZULIP_PATH"/scripts/setup/install --self-signed-cert --hostname 127.0.0.1 --email zulip-travis-admin@travis.example.com +env TRAVIS=1 "$ZULIP_PATH"/scripts/setup/install --self-signed-cert --hostname 127.0.0.1 --email circleci@example.com cat >>/etc/zulip/settings.py < "NoReturn": run_as_root(["cp", REPO_STOPWORDS_PATH, TSEARCH_STOPWORDS_PATH]) - if is_circleci or (is_travis and not options.is_production_travis): + if is_circleci and not options.is_production_test_suite: run_as_root(["service", "rabbitmq-server", "restart"]) run_as_root(["service", "redis-server", "restart"]) run_as_root(["service", "memcached", "restart"]) @@ -416,7 +416,7 @@ def main(options: argparse.Namespace) -> "NoReturn": [ provision_inner, *(["--force"] if options.is_force else []), - *(["--production-travis"] if options.is_production_travis else []), + *(["--production-test-suite"] if options.is_production_test_suite else []), ] ) @@ -427,10 +427,10 @@ if __name__ == "__main__": default=False, help="Ignore all provisioning optimizations.") - parser.add_argument('--production-travis', action='store_true', - dest='is_production_travis', + parser.add_argument('--production-test-suite', action='store_true', + dest='is_production_test_suite', default=False, - help="Provision for Travis with production settings.") + help="Provision for test suite with production settings.") options = parser.parse_args() main(options) diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py index 0a37a54286..06e19e7483 100755 --- a/tools/lib/provision_inner.py +++ b/tools/lib/provision_inner.py @@ -181,8 +181,8 @@ def main(options: argparse.Namespace) -> int: else: print("No need to run `scripts/setup/inline_email_css.py`.") - if not options.is_production_travis: - # The following block is skipped for the production Travis + if not options.is_production_test_suite: + # The following block is skipped for the production test # suite, because that suite doesn't make use of these elements # of the development environment (it just uses the development # environment to build a release tarball). @@ -280,10 +280,10 @@ if __name__ == "__main__": default=False, help="Ignore all provisioning optimizations.") - parser.add_argument('--production-travis', action='store_true', - dest='is_production_travis', + parser.add_argument('--production-test-suite', action='store_true', + dest='is_production_test_suite', default=False, - help="Provision for Travis with production settings.") + help="Provision for test suite with production settings.") options = parser.parse_args() sys.exit(main(options))