From 7eeca9da4675384c3e2389a8c521a6c6a1e7e31e Mon Sep 17 00:00:00 2001 From: Ganesh Pawar Date: Tue, 2 Feb 2021 17:06:59 +0530 Subject: [PATCH] provision: Add provision support for Ubuntu 20.10(Groovy). PostgreSQL 13 is used when os_version is 20.10. --- scripts/lib/setup-apt-repo | 2 +- tools/lib/provision.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo index ee99e8c276..f3dfb97b69 100755 --- a/scripts/lib/setup-apt-repo +++ b/scripts/lib/setup-apt-repo @@ -38,7 +38,7 @@ apt-get -y install "${pre_setup_deps[@]}" SCRIPTS_PATH="$(cd "$(dirname "$(dirname "$0")")" && pwd)" release=$(lsb_release -sc) -if [[ "$release" =~ ^(bionic|cosmic|disco|eoan|focal)$ ]]; then +if [[ "$release" =~ ^(bionic|cosmic|disco|eoan|focal|groovy)$ ]]; then distribution=ubuntu apt-key add "$SCRIPTS_PATH"/setup/pgdg.asc apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 2e9b54db7c..dd6ee2f26e 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -96,6 +96,8 @@ elif vendor == "ubuntu" and os_version in ["19.04", "19.10"]: # disco, eoan POSTGRESQL_VERSION = "11" elif vendor == "ubuntu" and os_version == "20.04": # focal POSTGRESQL_VERSION = "12" +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":