launchpad-reviewers team mailing list archive

[Guruprasad <mp+485514@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:make-postgresql-16-default-devenv-remove-older-versions into launchpad:master.

Commit message:
Install PostgreSQL 16 in the dev environment by default

This is necessary because we now run PostgreSQL 16 in production. This
also drops support for older PostgreSQL versions like 10 and 12.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/485514
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:make-postgresql-16-default-devenv-remove-older-versions into launchpad:master.

diff --git a/utilities/launchpad-database-setup b/utilities/launchpad-database-setup
index 7e9ca31..019b4ad 100755
--- a/utilities/launchpad-database-setup
+++ b/utilities/launchpad-database-setup
@@ -25,7 +25,7 @@ pgversion=
 # This loop contains multiple versions when we are in the process of
 # migrating between PostgreSQL versions.
 # shellcheck disable=SC2043
-for try_pgversion in 12 14 16
+for try_pgversion in 16
 do
   if sudo grep -qs "^auto" /etc/postgresql/$try_pgversion/main/start.conf; then
     pgversion="$try_pgversion"
diff --git a/utilities/rocketfuel-setup b/utilities/rocketfuel-setup
index 886cc9a..234c2ad 100755
--- a/utilities/rocketfuel-setup
+++ b/utilities/rocketfuel-setup
@@ -8,10 +8,8 @@
 # as utilities/rocketfuel-setup
 
 DO_WORKSPACE=1
-INSTALL_POSTGRES_14=0
-INSTALL_POSTGRES_16=0
 INSTALL_OPTS=""
-getopt_output="$(getopt -o '' -l no-workspace,postgres14,postgres16,lpusername:,assume-yes -- "$@")" || exit 1
+getopt_output="$(getopt -o '' -l no-workspace,lpusername:,assume-yes -- "$@")" || exit 1
 eval set -- "$getopt_output"
 while :; do
   case $1 in
@@ -19,14 +17,6 @@ while :; do
         DO_WORKSPACE=0
         shift
         ;;
-    --postgres14)
-        INSTALL_POSTGRES_14=1
-        shift
-        ;;
-    --postgres16)
-        INSTALL_POSTGRES_16=1
-        shift
-        ;;
     --lpusername)
         lpusername=$2
         echo "Using username $lpusername for Launchpad"
@@ -94,7 +84,7 @@ for hostname in $hostnames; do
   dev_host;
 done
 
-sudo add-apt-repository ppa:launchpad/ppa
+sudo add-apt-repository $INSTALL_OPTS ppa:launchpad/ppa
 
 do_install() {
   if ! dpkg -s "$pkg" | grep -q "^Status: install ok installed"; then
@@ -107,14 +97,9 @@ do_install() {
   }
 
 sudo apt update
-REQUIRED_PACKAGES="launchpad-developer-dependencies apache2 libapache2-mod-wsgi-py3"
-if [ $INSTALL_POSTGRES_14 == 1 ]; then
-  sudo add-apt-repository ppa:launchpad/postgresql-14-ports
-  REQUIRED_PACKAGES="launchpad-database-dependencies-14 ${REQUIRED_PACKAGES}"
-elif [ $INSTALL_POSTGRES_16 == 1 ]; then
-  sudo add-apt-repository ppa:launchpad/postgresql-16-ports
-  REQUIRED_PACKAGES="launchpad-database-dependencies-16 ${REQUIRED_PACKAGES}"
-fi
+REQUIRED_PACKAGES="launchpad-database-dependencies-16 launchpad-developer-dependencies apache2 libapache2-mod-wsgi-py3"
+sudo add-apt-repository $INSTALL_OPTS ppa:launchpad/postgresql-16-ports
+
 for pkg in $REQUIRED_PACKAGES; do
   do_install;
 done