provision: Upgrade support for Fedora to version 33.

Note that the `overwrite_symlink` changes fix a bug introduced in
5c20ee998c, that we need root
permissions to do those operations.
This commit is contained in:
Ganesh Pawar 2021-03-22 10:16:27 +05:30 committed by Tim Abbott
parent 666ab59b03
commit c1628e7605
3 changed files with 44 additions and 23 deletions

View File

@ -15,7 +15,7 @@ that's running one of:
* Ubuntu 20.04 Focal, 18.04 Bionic
* Debian 10 Buster
* CentOS 7 (beta)
* Fedora 29 (beta)
* Fedora 33 (beta)
* RHEL 7 (beta)
You can just run the Zulip provision script on your machine.

View File

@ -53,6 +53,7 @@ elif [ "$is_rhel" = true ]; then
yum localinstall -y https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-latest-x86_64/pgdg-redhat10-10-2.noarch.rpm
yum localinstall -y https://packages.groonga.org/centos/groonga-release-latest.noarch.rpm
else
# TODO only fedora29 for now
dnf install -y "https://download.postgresql.org/pub/repos/yum/$PGVER/fedora/fedora-29-x86_64/pgdg-fedora$PGVER-$PGVER-4.noarch.rpm"
# TODO only fedora33 for now
PGVER=13
dnf install -y "https://download.postgresql.org/pub/repos/yum/reporpms/F-33-x86_64/pgdg-fedora-repo-latest.noarch.rpm"
fi

View File

@ -26,7 +26,6 @@ from scripts.lib.zulip_tools import (
WARNING,
get_dev_uuid_var_path,
os_families,
overwrite_symlink,
parse_os_release,
run_as_root,
)
@ -108,8 +107,8 @@ elif vendor == "ubuntu" and os_version == "20.10": # groovy
POSTGRESQL_VERSION = "13"
elif vendor == "neon" and os_version == "20.04": # KDE Neon
POSTGRESQL_VERSION = "12"
elif vendor == "fedora" and os_version == "29":
POSTGRESQL_VERSION = "10"
elif vendor == "fedora" and os_version == "33":
POSTGRESQL_VERSION = "13"
elif vendor == "rhel" and os_version.startswith("7."):
POSTGRESQL_VERSION = "10"
elif vendor == "centos" and os_version == "7":
@ -135,18 +134,7 @@ COMMON_DEPENDENCIES = [
"unzip", # Needed for Slack import
"crudini", # Used for shell tooling w/ zulip.conf
# Puppeteer dependencies from here
"gconf-service",
"libgconf-2-4",
"libgtk-3-0",
"libatk-bridge2.0-0",
"libx11-xcb1",
"libxcb-dri3-0",
"libgbm1",
"libxss1",
"fonts-freefont-ttf",
"libappindicator1",
"xdg-utils",
"xvfb",
# Puppeteer dependencies end here.
]
@ -156,6 +144,19 @@ UBUNTU_COMMON_APT_DEPENDENCIES = [
"hunspell-en-us",
"puppet-lint",
"default-jre-headless", # Required by vnu-jar
# Puppeteer dependencies from here
"fonts-freefont-ttf",
"gconf-service",
"libappindicator1",
"libatk-bridge2.0-0",
"libgbm1",
"libgconf-2-4",
"libgtk-3-0",
"libx11-xcb1",
"libxcb-dri3-0",
"libxss1",
"xvfb",
# Puppeteer dependencies end here.
*THUMBOR_VENV_DEPENDENCIES,
]
@ -165,6 +166,17 @@ COMMON_YUM_DEPENDENCIES = [
"hunspell-en-US",
"rubygem-puppet-lint",
"nmap-ncat",
"ccache", # Required to build pgroonga from source.
# Puppeteer dependencies from here
"at-spi2-atk",
"GConf2",
"gtk3",
"libX11-xcb",
"libxcb",
"libXScrnSaver",
"mesa-libgbm",
"xorg-x11-server-Xvfb",
# Puppeteer dependencies end here.
*YUM_THUMBOR_VENV_DEPENDENCIES,
]
@ -323,13 +335,21 @@ def install_yum_deps(deps_to_install: List[str]) -> None:
# Later steps will ensure PostgreSQL is started
# Link in tsearch data files
overwrite_symlink(
run_as_root(
[
"ln",
"-nsf",
"/usr/share/myspell/en_US.dic",
f"/usr/pgsql-{POSTGRESQL_VERSION}/share/tsearch_data/en_us.dict",
]
)
overwrite_symlink(
run_as_root(
[
"ln",
"-nsf",
"/usr/share/myspell/en_US.aff",
f"/usr/pgsql-{POSTGRESQL_VERSION}/share/tsearch_data/en_us.affix",
]
)