launchpad-reviewers team mailing list archive

[Guruprasad <mp+476112@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:rocketfuel-setup-port-noble into launchpad:master.

Commit message:
Add support for setting up a dev environment on noble

Simplify the rocketfuel-setup code to add new apt sources using the
add-apt-repository command that is independent of the series and the
configuration file format (deb822 vs pre-deb822 format). Also allow
the database setup script to run against PostgreSQL 14 and 16.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/476112
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:rocketfuel-setup-port-noble into launchpad:master.

diff --git a/utilities/launchpad-database-setup b/utilities/launchpad-database-setup
index b3cae18..66da23c 100755
--- a/utilities/launchpad-database-setup
+++ b/utilities/launchpad-database-setup
@@ -24,7 +24,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 10 12
+for try_pgversion in 12 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 8edae82..b0799f1 100755
--- a/utilities/rocketfuel-setup
+++ b/utilities/rocketfuel-setup
@@ -90,43 +90,9 @@ for hostname in $hostnames; do
   dev_host;
 done
 
-# Enable relevant Ubuntu package repositories
-if ! grep -qE "^deb https?:.* ${DISTRIB_CODENAME} .*universe" /etc/apt/sources.list; then
-    echo "Please enable the 'universe' component in /etc/apt/sources.list'"
-    exit 1
-fi
-if ! grep -qE "^deb https?:.* ${DISTRIB_CODENAME} .*multiverse" /etc/apt/sources.list; then
-    echo "Please enable the 'multiverse' component in /etc/apt/sources.list'"
-    exit 1
-fi
-
-LPDEV_SOURCES="/etc/apt/sources.list.d/launchpad-dev.list"
-if [ ! -e $LPDEV_SOURCES ]; then
-  sudo touch $LPDEV_SOURCES
-fi
-
-LP_PPA="deb http://ppa.launchpad.net/launchpad/ppa/ubuntu ${DISTRIB_CODENAME} main"
-if ! grep -q "^${LP_PPA}" $LPDEV_SOURCES; then
-  echo "Adding ~launchpad PPA repository to package source list."
-  echo "$LP_PPA"  | sudo tee -a $LPDEV_SOURCES
-fi
-REQUIRED_PPA_KEYS="2AF499CB24AC5F65461405572D1FFB6C0A5174AF"
-
-# Get the key used to sign the launchpad-developer-dependencies in the PPA.
-for key in $REQUIRED_PPA_KEYS; do
-   if ! sudo APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 \
-       apt-key adv --list-keys --with-colons --fingerprint | grep -qE "^fpr:+$key"; then
-     echo "Retrieving key $key."
-     if ! gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "$key"; then
-       echo "Could not retrieve key $key."
-       exit 1
-     fi
-     if ! gpg --export -a "$key" | sudo apt-key add -; then
-       echo "Could not install key $key."
-       exit 1
-     fi
-   fi
-done
+sudo add-apt-repository $INSTALL_OPTS universe
+sudo add-apt-repository $INSTALL_OPTS multiverse
+sudo add-apt-repository $INSTALL_OPTS -u ppa:launchpad/ppa
 
 do_install() {
   if ! dpkg -s "$pkg" | grep -q "^Status: install ok installed"; then