From 6a4792e844aa6572d898522ee12b1d98cd62ba22 Mon Sep 17 00:00:00 2001
From: Priyank Patel <priyankp390@gmail.com>
Date: Wed, 8 Jul 2020 19:01:15 +0000
Subject: [PATCH] tools/ci: Adjust ZULIP_PATH so it works for both CIs.

Until, we remove the circleci.
---
 .circleci/config.yml                | 6 +++---
 tools/ci/production-extract-tarball | 6 +++++-
 tools/ci/production-install         | 5 ++++-
 tools/ci/production-upgrade-pg      | 5 ++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bb892085e2..9d86799549 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -136,19 +136,19 @@ aliases:
       name: install production
       command: |
         sudo service rabbitmq-server restart
-        sudo mispipe "/tmp/production-install 2>&1" ts
+        sudo --preserve-env=CIRCLECI mispipe "/tmp/production-install 2>&1" ts
 
   - &verify_production
     run:
       name: verify install
       command: |
-        sudo mispipe "/tmp/production-verify 2>&1" ts
+        sudo --preserve-env=CIRCLECI mispipe "/tmp/production-verify 2>&1" ts
 
   - &upgrade_postgresql
     run:
       name: upgrade postgresql
       command: |
-        sudo mispipe "/tmp/production-upgrade-pg 2>&1" ts
+        sudo --preserve-env=CIRCLECI mispipe "/tmp/production-upgrade-pg 2>&1" ts
 
   - &check_xenial_provision_error
     run:
diff --git a/tools/ci/production-extract-tarball b/tools/ci/production-extract-tarball
index b8fa14a1fa..4f13fc874a 100755
--- a/tools/ci/production-extract-tarball
+++ b/tools/ci/production-extract-tarball
@@ -3,5 +3,9 @@
 set -e
 set -x
 
-ZULIP_PATH=/home/circleci/zulip
+ZULIP_PATH=/home/github/zulip
+if [ "$CIRCLECI" = true ]; then
+    ZULIP_PATH=/home/circleci/zulip
+fi
+
 tar -xf /tmp/zulip-server-test.tar.gz -C "$ZULIP_PATH" --strip-components=1
diff --git a/tools/ci/production-install b/tools/ci/production-install
index c76564cb89..739ab0b117 100755
--- a/tools/ci/production-install
+++ b/tools/ci/production-install
@@ -4,7 +4,10 @@
 set -e
 set -x
 
-ZULIP_PATH=/home/circleci/zulip
+ZULIP_PATH=/home/github/zulip
+if [ "$CIRCLECI" = true ]; then
+    ZULIP_PATH=/home/circleci/zulip
+fi
 
 # Do an apt upgrade to start with an up-to-date machine
 APT_OPTIONS=(-o 'Dpkg::Options::=--force-confdef' -o 'Dpkg::Options::=--force-confold')
diff --git a/tools/ci/production-upgrade-pg b/tools/ci/production-upgrade-pg
index fc81843ca4..d954ffe780 100755
--- a/tools/ci/production-upgrade-pg
+++ b/tools/ci/production-upgrade-pg
@@ -3,7 +3,10 @@
 set -e
 set -x
 
-ZULIP_PATH=/home/circleci/zulip
+ZULIP_PATH=/home/github/zulip
+if [ "$CIRCLECI" = true ]; then
+    ZULIP_PATH=/home/circleci/zulip
+fi
 
 supervisorctl stop all
 "$ZULIP_PATH"/scripts/setup/upgrade-postgres