Add Ubuntu impish, retire Ubuntu groovy

diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source
index badaa3b7b7e4ff8e2ffb5d695b90853152beddb2..a412f89caee54f5a953b11b84b47c0e59ada1c3c 100755 (executable)
--- a/jenkins/generate-pgdg-source
+++ b/jenkins/generate-pgdg-source
@@ -146,7 +146,7 @@ esac
 case $PACKAGE in
   postgresql-1[1-9]) # use llvm >= 5 (older versions choke on C++ exceptions, breaks PostGIS)
     case $distribution in
-      hirsute) # clang-12
+      impish|hirsute) # clang-12
         sed -i -e 's/\(llvm\|llvm-config\|clang\)-[0-9]\+/\1-12/g' debian/control debian/rules
         TWEAK+=("Use clang/llvm 12 for jit support.")
         ;;
@@ -214,7 +214,7 @@ case $PACKAGE in
       xenial) debhelper_compat 10 ;;
       bionic) debhelper_compat 12 ;;
       eoan|focal) debhelper_compat 12 ;;
-      groovy|hirsute) debhelper_compat 13 ;;
+      groovy|hirsute|impish) debhelper_compat 13 ;;
     esac
     ;;
   *) # debhelper without backport
@@ -225,7 +225,7 @@ case $PACKAGE in
       xenial) debhelper_compat 9 ;;
       bionic) debhelper_compat 11 ;;
       eoan|focal) debhelper_compat 12 ;;
-      groovy|hirsute) debhelper_compat 13 ;;
+      groovy|hirsute|impish) debhelper_compat 13 ;;
     esac
     ;;
 esac

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 89f8557e742a78435e897f7a0a8fa3931e0acd96..cb536b761f8f027d15764ad546f52fe196d8f642 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -14,11 +14,11 @@
         - timestamps
     dist-filter: 'true'
     arch-filter: 'true'
-    filter: &filter 'architecture=="amd64" || distribution=="sid" || (architecture=="arm64" && !(distribution in ["stretch", "hirsute", "groovy"])) || (architecture=="i386" && (distribution in ["buster", "stretch", "bionic"])) || (architecture=="ppc64el" && !(distribution in ["hirsute", "groovy"]))'
+    filter: &filter 'architecture=="amd64" || distribution=="sid" || (architecture=="arm64" && !(distribution in ["stretch", "impish", "hirsute"])) || (architecture=="i386" && (distribution in ["buster", "stretch", "bionic"])) || (architecture=="ppc64el" && !(distribution in ["impish", "hirsute"]))'
     filter_pattern: &filter_pattern '({arch-filter}) && ({dist-filter}) && ({filter})'
     filter_patbeta: &filter_patbeta '({arch-filter}) && ({dist-filter}) && ({filter}) && !(distribution in ["groovy"])'
     # patbeta: variant of filter that excludes PostgreSQL-beta packages to be built
-    pg_filter: &pg_filter '!(distribution in ["hirsute", "groovy"])'
+    pg_filter: &pg_filter '!(distribution in ["impish", "hirsute"])'
     # pg_filter: build older PostgreSQL server versions on all LTS releases
     git-branch: master
     backports: ''
@@ -133,8 +133,8 @@
                     - bullseye
                     - buster
                     - stretch
+                    - impish
                     - hirsute
-                    - groovy
                     - focal
                     - bionic
 
@@ -1673,7 +1673,7 @@
         name: postgresql-14
         git-url: https://salsa.debian.org/postgresql/postgresql.git
         git-branch: 14
-        dist-filter: '!(distribution in ["groovy"])'
+        #dist-filter: '!(distribution in ["groovy"])'
         jobs:
                 - git-packages
 
@@ -1851,7 +1851,7 @@
         name: rdkit
         git-url: https://salsa.debian.org/debichem-team/rdkit.git
         # build-dependencies renamed on older dists
-        dist-filter: '!(distribution in ["buster", "stretch", "groovy", "focal", "bionic"])'
+        dist-filter: '!(distribution in ["buster", "stretch", "focal", "bionic"])'
         # test failures on i386
         arch-filter: 'architecture!="i386"'
         jobs:

diff --git a/pgapt.conf b/pgapt.conf
index bb90574efa69f0cddbde90a1e6034831fc1e9304..6de3d53151105ed4e1b2fc09e8a85f2ef38833ad 100644 (file)
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -2,10 +2,12 @@ PG_OLDEST_VERSION=9.5
 PG_MAIN_VERSION=13
 PG_BETA_VERSION=14
 PG_DEVEL_VERSION=15
+# supported dists: actively updated
 PG_SUPPORTED_DISTS="sid bullseye buster stretch
-       hirsute groovy focal bionic"
+       impish hirsute focal bionic"
+# repository dists: kept in repository config
 PG_REPOSITORY_DISTS="sid bullseye buster stretch
-       hirsute groovy focal bionic xenial"
+       impish hirsute groovy focal bionic xenial"
 
 set_dist_vars () { # args: $1 = distribution [$2 = architecture]
   HAS_BACKPORTS=""
@@ -22,6 +24,7 @@ set_dist_vars () { # args: $1 = distribution [$2 = architecture]
     lenny)   PGDG_DISTRIBUTION="pgdg50"    DISTRO="debian" RELEASE="5.0" ;;
     etch)    PGDG_DISTRIBUTION="pgdg40"    DISTRO="debian" RELEASE="4.1" ;;
     # Ubuntu
+    impish)  PGDG_DISTRIBUTION="pgdg21.10" DISTRO="ubuntu" RELEASE="21.10"                 ARCHS="amd64"                    COMPONENTS="main                                     9.6 10 11 12 13 14" ;;
     hirsute) PGDG_DISTRIBUTION="pgdg21.04" DISTRO="ubuntu" RELEASE="21.04"                 ARCHS="amd64"                    COMPONENTS="main                                     9.6 10 11 12 13 14" ;;
     groovy)  PGDG_DISTRIBUTION="pgdg20.10" DISTRO="ubuntu" RELEASE="20.10"                 ARCHS="amd64"                    COMPONENTS="main                                 9.5 9.6 10 11 12 13" ;;
     focal)   PGDG_DISTRIBUTION="pgdg20.04" DISTRO="ubuntu" RELEASE="20.04"                 ARCHS="amd64 arm64 ppc64el"      COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15" ;;

diff --git a/repo/conf/distributions b/repo/conf/distributions
index ad29f8c78dfed816e4cdec51d48fee2b0b750f11..5f98be44829183342ed43450092fd79f1a064c30 100644 (file)
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -126,6 +126,38 @@ Contents: percomponent nocompatsymlink
 NotAutomatic: yes
 ButAutomaticUpgrades: yes
 
+Codename: impish-pgdg
+Suite: impish-pgdg
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 9.6 10 11 12 13 14
+SignWith: ACCC4CF8
+Log: impish-pgdg.log
+Uploaders: uploaders
+DebIndices: Packages Release . .gz .bz2
+UDebIndices: Packages . .gz .bz2
+DscIndices: Sources Release .gz .bz2
+Tracking: minimal includebuildinfos keepsources
+Contents: percomponent nocompatsymlink
+
+Codename: impish-pgdg-testing
+Suite: impish-pgdg-testing
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 9.6 10 11 12 13 14
+SignWith: ACCC4CF8
+Log: impish-pgdg-testing.log
+Uploaders: uploaders
+DebIndices: Packages Release . .gz .bz2
+UDebIndices: Packages . .gz .bz2
+DscIndices: Sources Release .gz .bz2
+Tracking: minimal includebuildinfos keepsources
+Contents: percomponent nocompatsymlink
+NotAutomatic: yes
+ButAutomaticUpgrades: yes
+
 Codename: hirsute-pgdg
 Suite: hirsute-pgdg
 Origin: apt.postgresql.org