Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

upgrade-zulip: Pass any arguments down to upgrade-zulip-stage-2. 

This is the equivalent of 93f3da4c05 but
for the tarball codepath.
This commit is contained in:
Alex Vandiver 2022-01-05 14:10:28 -08:00 committed by Tim Abbott
parent 06e115bb00
commit b31658482b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/lib/upgrade-zulip
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse
import configparser import configparser
import logging import logging
import os import os
@ -13,8 +14,6 @@ os.environ["PYTHONUNBUFFERED"] = "y"
sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..")) sys.path.append(os.path.join(os.path.dirname(__file__), "..", ".."))
from scripts.lib.zulip_tools import ( from scripts.lib.zulip_tools import (
DEPLOYMENTS_DIR, DEPLOYMENTS_DIR,
ENDC,
FAIL,
assert_running_as_root, assert_running_as_root,
get_config_file, get_config_file,
get_deploy_options, get_deploy_options,
@ -34,13 +33,11 @@ os.umask(0o22)
logging.Formatter.converter = time.gmtime logging.Formatter.converter = time.gmtime
logging.basicConfig(format="%(asctime)s upgrade-zulip: %(message)s", level=logging.INFO) logging.basicConfig(format="%(asctime)s upgrade-zulip: %(message)s", level=logging.INFO)
if len(sys.argv) != 2: parser = argparse.ArgumentParser()
print(FAIL + f"Usage: {sys.argv[0]} <tarball>" + ENDC) parser.add_argument("tarball", help="Path to Zulip Server tarball")
sys.exit(1) args, extra_options = parser.parse_known_args()
tarball_path = sys.argv[1] error_rerun_script = f"{DEPLOYMENTS_DIR}/current/scripts/upgrade-zulip {args.tarball}"
error_rerun_script = f"{DEPLOYMENTS_DIR}/current/scripts/upgrade-zulip {tarball_path}"
get_deployment_lock(error_rerun_script) get_deployment_lock(error_rerun_script)
try: try:
@ -50,8 +47,8 @@ try:
# not readable by the Zulip user. # not readable by the Zulip user.
logging.info("Archiving the tarball under %s", TARBALL_ARCHIVE_PATH) logging.info("Archiving the tarball under %s", TARBALL_ARCHIVE_PATH)
os.makedirs(TARBALL_ARCHIVE_PATH, exist_ok=True) os.makedirs(TARBALL_ARCHIVE_PATH, exist_ok=True)
archived_tarball_path = os.path.join(TARBALL_ARCHIVE_PATH, os.path.basename(tarball_path)) archived_tarball_path = os.path.join(TARBALL_ARCHIVE_PATH, os.path.basename(args.tarball))
shutil.copy(tarball_path, archived_tarball_path) shutil.copy(args.tarball, archived_tarball_path)
subprocess.check_output(["chown", "-R", "zulip:zulip", TARBALL_ARCHIVE_PATH]) subprocess.check_output(["chown", "-R", "zulip:zulip", TARBALL_ARCHIVE_PATH])
logging.info("Unpacking the tarball") logging.info("Unpacking the tarball")
@ -67,7 +64,12 @@ try:
os.chdir(deploy_path) os.chdir(deploy_path)
try: try:
subprocess.check_call( subprocess.check_call(
[os.path.abspath("./scripts/lib/upgrade-zulip-stage-2"), deploy_path, *deploy_options] [
os.path.abspath("./scripts/lib/upgrade-zulip-stage-2"),
deploy_path,
*deploy_options,
*extra_options,
]
) )
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
# There's no use in showing a stacktrace here; it just hides # There's no use in showing a stacktrace here; it just hides