Adds postgres support matrix support for debian based systems (#738)

citusdata · Oct 6, 2021 · 9a73da7 · 9a73da7
1 parent 0c3a592
commit 9a73da7
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 35 deletions.
diff --git a/dockerfiles/debian-bullseye-all/scripts/fetch_and_build_deb b/dockerfiles/debian-bullseye-all/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac
 

diff --git a/dockerfiles/debian-buster-all/scripts/fetch_and_build_deb b/dockerfiles/debian-buster-all/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac
 

diff --git a/dockerfiles/debian-stretch-all/scripts/fetch_and_build_deb b/dockerfiles/debian-stretch-all/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac
 

diff --git a/dockerfiles/ubuntu-bionic-all/scripts/fetch_and_build_deb b/dockerfiles/ubuntu-bionic-all/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac
 

diff --git a/dockerfiles/ubuntu-focal-all/scripts/fetch_and_build_deb b/dockerfiles/ubuntu-focal-all/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac
 

diff --git a/dockerfiles/ubuntu-xenial-all/scripts/fetch_and_build_deb b/dockerfiles/ubuntu-xenial-all/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac
 

diff --git a/scripts/fetch_and_build_deb b/scripts/fetch_and_build_deb
@@ -49,15 +49,26 @@ fi
 # populate variables from packaging metadata file
 # shellcheck source=/dev/null
 source /buildfiles/pkgvars
+# Read PostgreSQL versions from file.
+# supported-postgres file is derived file from postgres-matrix.yml file by citus_package.
+# If file does not exist, skip populating file
+[[ -f "/buildfiles/supported-postgres" ]] && source /buildfiles/supported-postgres
 
-# set default values for certain packaging variables
+# Fetch pkgname, hubproj, nightlyref, versioning from pkgvars file
 declare pkglatest # to make shellcheck happy
 pkgname="${deb_pkgname:-${pkgname}}"
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-11,12,13}"
-nightlypg="${nightlypg:-${releasepg}}"
 versioning="${versioning:-simple}"
+# Fetch pg release and nightly versions from supported-postgres file which is originated from postgres-matrix.yml file
+# If this file is not found, releasepg and nightlypg parameters from pkgvars are used for defining pg versions
+pg_release_versions="${release_versions:-${releasepg}}"
+pg_nightly_versions="${nightly_versions:-${nightlypg}}"
+
+
+echo "Postgres versions:"
+echo "Release Versions: ${pg_release_versions}"
+echo "Nightly Versions: ${pg_nightly_versions}"
 
 if [ -z "${pkglatest}" ]; then
     echo "$0: pkgvars file must specify a value for pkglatest" >&2
@@ -96,7 +107,7 @@ case "${1}" in
             exit $failure
         fi
 
-        echo "${releasepg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_release_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
     *)
         if [ "${1}" == 'nightly' ]; then
@@ -124,7 +135,7 @@ case "${1}" in
         packageversion="${nextversion}.citus~${packagesuffix}"
         export CONF_EXTRA_VERSION="+${packagesuffix}"
 
-        echo "${nightlypg}" | tr ',' '\n' > "${builddir}/debian/pgversions"
+        echo "${pg_nightly_versions}" | tr ',' '\n' > "${builddir}/debian/pgversions"
         ;;
 esac