ci: Test upgrade-postgresql on Ubuntu 20.04.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

.github/workflows/production-suite.yml

@@ -197,19 +197,19 @@ jobs:
         run: sudo /tmp/production-verify ${{ matrix.extra-args }}
 
       - name: Install pgroonga
-        if: ${{ matrix.is_bionic }}
+        if: ${{ matrix.os == 'focal' }}
         run: sudo /tmp/production-pgroonga
 
       - name: Verify install after installing pgroonga
-        if: ${{ matrix.is_bionic }}
+        if: ${{ matrix.os == 'focal' }}
         run: sudo /tmp/production-verify ${{ matrix.extra-args }}
 
       - name: Upgrade postgresql
-        if: ${{ matrix.is_bionic }}
+        if: ${{ matrix.os == 'focal' }}
         run: sudo /tmp/production-upgrade-pg
 
       - name: Verify install after upgrading postgresql
-        if: ${{ matrix.is_bionic }}
+        if: ${{ matrix.os == 'focal' }}
         run: sudo /tmp/production-verify ${{ matrix.extra-args }}
 
       - name: Report status

tools/ci/production-install

@@ -61,8 +61,8 @@ os_info="$(
     read -r os_version_id
 } <<<"$os_info"
 
-# Pin to PostgreSQL 10 on Bionic, so we can test upgrading it
-if [ "$os_id $os_version_id" = 'ubuntu 18.04' ]; then
+# Pin to PostgreSQL 10 on Ubuntu 20.04, so we can test upgrading it
+if [ "$os_id $os_version_id" = 'ubuntu 20.04' ]; then
     export POSTGRESQL_VERSION=10
 fi
 
@@ -75,7 +75,7 @@ else
     "$ZULIP_PATH"/scripts/setup/install --self-signed-cert --hostname 127.0.0.1 --email circleci@example.com --postgresql-database-user zulipcustomuser --postgresql-database-name zulipcustomdb
 fi
 
-if [ "$os_id $os_version_id" = 'ubuntu 18.04' ]; then
+if [ "$os_id $os_version_id" = 'ubuntu 20.04' ]; then
     if [ "$(crudini --get /etc/zulip/zulip.conf postgresql version)" != "10" ]; then
         echo "Installer did not install the PostgreSQL 10 that we asked for!"
         exit 1