From 472e216cecc4538a57f2e60ee6629f57fdda6539 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 13 May 2022 20:59:34 -0700 Subject: [PATCH] Revert "apt-repos: Downgrade PostgreSQL to dodge PGroonga regression." This reverts commit 9c8d2b7be39314b41f04a1e1356942afe21ab223 (#21115). The PostgreSQL fix was released 2022-05-12. Signed-off-by: Anders Kaseorg (cherry picked from commit f8957863a23b84eb361016176323e0b2cc99116b) --- scripts/lib/install | 4 ++-- scripts/lib/upgrade-zulip-stage-2 | 4 ++-- scripts/setup/apt-repos/zulip/bullseye.list | 3 --- scripts/setup/apt-repos/zulip/focal.list | 3 --- scripts/setup/apt-repos/zulip/zulip.pref | 19 ------------------- 5 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 scripts/setup/apt-repos/zulip/zulip.pref diff --git a/scripts/lib/install b/scripts/lib/install index 62bfd104fc..653961459d 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -335,7 +335,7 @@ fi # installation process more seamless. if [ -z "$NO_DIST_UPGRADE" ]; then if [ "$package_system" = apt ]; then - apt-get -y --allow-downgrades dist-upgrade "${APT_OPTIONS[@]}" + apt-get -y dist-upgrade "${APT_OPTIONS[@]}" elif [ "$package_system" = yum ]; then # On CentOS, there is no need to do `yum -y upgrade` because `yum -y # update` already does the same thing. @@ -453,7 +453,7 @@ fi "$ZULIP_PATH"/scripts/zulip-puppet-apply -f if [ "$package_system" = apt ]; then - apt-get -y --allow-downgrades upgrade + apt-get -y upgrade elif [ "$package_system" = yum ]; then # No action is required because `yum update` already does upgrade. : diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2 index d578973da9..0790f09431 100755 --- a/scripts/lib/upgrade-zulip-stage-2 +++ b/scripts/lib/upgrade-zulip-stage-2 @@ -197,7 +197,7 @@ if glob.glob("/usr/share/postgresql/*/extension/tsearch_extras.control"): if not args.skip_puppet: logging.info("Upgrading system packages...") subprocess.check_call(["apt-get", "update"]) - subprocess.check_call(["apt-get", "-y", "--allow-downgrades", "upgrade"]) + subprocess.check_call(["apt-get", "-y", "upgrade"]) # To bootstrap zulip-puppet-apply, we need to install the system yaml # package; new installs get this, but old installs may not have it. @@ -362,7 +362,7 @@ if not args.skip_puppet: shutdown_server() logging.info("Applying Puppet changes...") subprocess.check_call(["./scripts/zulip-puppet-apply", "--force"]) - subprocess.check_call(["apt-get", "-y", "--allow-downgrades", "upgrade"]) + subprocess.check_call(["apt-get", "-y", "upgrade"]) # Puppet may have reloaded supervisor, and in so doing started # services; mark as potentially needing to stop the server. IS_SERVER_UP = True diff --git a/scripts/setup/apt-repos/zulip/bullseye.list b/scripts/setup/apt-repos/zulip/bullseye.list index 8e31cac25f..4c6663d160 100644 --- a/scripts/setup/apt-repos/zulip/bullseye.list +++ b/scripts/setup/apt-repos/zulip/bullseye.list @@ -1,5 +1,2 @@ deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main deb-src http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main - -deb http://apt-archive.postgresql.org/pub/repos/apt/ bullseye-pgdg-archive main -deb-src http://apt-archive.postgresql.org/pub/repos/apt/ bullseye-pgdg-archive main diff --git a/scripts/setup/apt-repos/zulip/focal.list b/scripts/setup/apt-repos/zulip/focal.list index 595b2ad521..8578405cfe 100644 --- a/scripts/setup/apt-repos/zulip/focal.list +++ b/scripts/setup/apt-repos/zulip/focal.list @@ -1,8 +1,5 @@ deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main deb-src http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main -deb http://apt-archive.postgresql.org/pub/repos/apt/ focal-pgdg-archive main -deb-src http://apt-archive.postgresql.org/pub/repos/apt/ focal-pgdg-archive main - deb http://ppa.launchpad.net/groonga/ppa/ubuntu focal main deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu focal main diff --git a/scripts/setup/apt-repos/zulip/zulip.pref b/scripts/setup/apt-repos/zulip/zulip.pref deleted file mode 100644 index 5a5f47059a..0000000000 --- a/scripts/setup/apt-repos/zulip/zulip.pref +++ /dev/null @@ -1,19 +0,0 @@ -Package: postgresql-10 postgresql-client-10 postgresql-server-dev-10 -Pin: version 10.19-* -Pin-Priority: 1000 - -Package: postgresql-11 postgresql-client-11 postgresql-server-dev-11 -Pin: version 11.14-* -Pin-Priority: 1000 - -Package: postgresql-12 postgresql-client-12 postgresql-server-dev-12 -Pin: version 12.9-* -Pin-Priority: 1000 - -Package: postgresql-13 postgresql-client-13 postgresql-server-dev-13 -Pin: version 13.5-* -Pin-Priority: 1000 - -Package: postgresql-14 postgresql-client-14 postgresql-server-dev-14 -Pin: version 14.1-* -Pin-Priority: 1000