tools/ci: Adjust ZULIP_PATH so it works for both CIs.

Until, we remove the circleci.
This commit is contained in:
Priyank Patel
2020-07-08 19:01:15 +00:00
committed by Tim Abbott
parent 75ab26771b
commit 6a4792e844
4 changed files with 16 additions and 6 deletions

View File

@@ -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:

View File

@@ -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

View File

@@ -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')

View File

@@ -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