Shipping pg17 in the installer script and consequently in the docker …

…installation too (#2133)
yugabyte · Jan 3, 2025 · 29b09a8 · 29b09a8
1 parent fa542b7
commit 29b09a8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/pg-13-migtests.yml b/.github/workflows/pg-13-migtests.yml
@@ -70,10 +70,12 @@ jobs:
           cd installer_scripts
           yes | ./install-yb-voyager --install-from-local-source --only-pg-support
           sudo rm /usr/bin/pg_dump
-          sudo ln -s /usr/lib/postgresql/16/bin/pg_dump /usr/bin/pg_dump
+          sudo ln -s /usr/lib/postgresql/17/bin/pg_dump /usr/bin/pg_dump
           sudo rm /usr/bin/pg_restore
-          sudo ln -s /usr/lib/postgresql/16/bin/pg_restore /usr/bin/pg_restore
+          sudo ln -s /usr/lib/postgresql/17/bin/pg_restore /usr/bin/pg_restore
           pg_dump --version
+          pg_restore --version
+          psql --version
         env:
           ON_INSTALLER_ERROR_OUTPUT_LOG: Y
 
@@ -119,10 +121,6 @@ jobs:
         if: ${{ !cancelled() && matrix.test_group == 'offline' }}
         run: migtests/scripts/run-test-export-data.sh pg/case-sensitivity-single-table
 
-      - name: "TEST: pg-dvdrental"
-        if: ${{ !cancelled() && matrix.test_group == 'offline' }}
-        run: migtests/scripts/run-test.sh pg/dvdrental
-
       - name: "TEST: pg-datatypes"
         if: ${{ !cancelled() && matrix.test_group == 'offline' }}
         run: migtests/scripts/run-test.sh pg/datatypes

diff --git a/.github/workflows/pg-17-migtests.yml b/.github/workflows/pg-17-migtests.yml
@@ -65,17 +65,17 @@ jobs:
           sudo apt install -y libpq-dev
           sudo apt install python3-psycopg2
 
-      #TODO Remove the install PG 17 command once we do that in installer script 
       - name: Run installer script to setup voyager
         run: |
           cd installer_scripts
           yes | ./install-yb-voyager --install-from-local-source --only-pg-support
-          sudo apt-get -y install postgresql-17 
           sudo rm /usr/bin/pg_dump
           sudo ln -s /usr/lib/postgresql/17/bin/pg_dump /usr/bin/pg_dump
           sudo rm /usr/bin/pg_restore
           sudo ln -s /usr/lib/postgresql/17/bin/pg_restore /usr/bin/pg_restore
           pg_dump --version
+          pg_restore --version
+          psql --version
         env:
           ON_INSTALLER_ERROR_OUTPUT_LOG: Y
 

diff --git a/.github/workflows/pg-9-migtests.yml b/.github/workflows/pg-9-migtests.yml
@@ -63,10 +63,12 @@ jobs:
           cd installer_scripts
           yes | ./install-yb-voyager --install-from-local-source --only-pg-support
           sudo rm /usr/bin/pg_dump
-          sudo ln -s /usr/lib/postgresql/16/bin/pg_dump /usr/bin/pg_dump
+          sudo ln -s /usr/lib/postgresql/17/bin/pg_dump /usr/bin/pg_dump
           sudo rm /usr/bin/pg_restore
-          sudo ln -s /usr/lib/postgresql/16/bin/pg_restore /usr/bin/pg_restore
+          sudo ln -s /usr/lib/postgresql/17/bin/pg_restore /usr/bin/pg_restore
           pg_dump --version
+          pg_restore --version
+          psql --version
         env:
           ON_INSTALLER_ERROR_OUTPUT_LOG: Y
 
@@ -110,4 +112,4 @@ jobs:
 
       - name: "TEST: pg-constraints"
         if: ${{ !cancelled() }}
-        run: migtests/scripts/run-test.sh pg/constraints
+        run: migtests/scripts/run-test.sh pg/constraints
diff --git a/installer_scripts/install-yb-voyager b/installer_scripts/install-yb-voyager
@@ -142,7 +142,7 @@ centos_main() {
 	output "Installing RPM dependencies."
 	$YUM_INSTALL which wget git gcc make 1>&2
 	$YUM_INSTALL https://download.postgresql.org/pub/repos/yum/reporpms/EL-${majorVersion}-x86_64/pgdg-redhat-repo-latest.noarch.rpm 1>&2 || true
-	$YUM_INSTALL postgresql16 1>&2
+	$YUM_INSTALL postgresql17 1>&2
 	$YUM_INSTALL sqlite 1>&2
 	create_guardrail_scripts_dir
 	create_pg_dump_args_file
@@ -953,7 +953,7 @@ ubuntu_install_postgres() {
 	sudo apt install -y postgresql-common 1>&2
     echo | sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh 1>&2
 	sudo apt-get update 1>&2
-	sudo apt-get -y install postgresql-16  1>&2
+	sudo apt-get -y install postgresql-17  1>&2
 	output "Postgres Installed."
 }