Add Ubuntu oracular, retire mantic

4 files changed, 60 insertions, 8 deletions

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index ae87d2f..f11ceec 100644
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -32,13 +32,13 @@
     filter: &filter |
       architecture=="amd64" ||
       distribution=="sid" ||
-      (architecture in ["arm64", "ppc64el", "s390x"] && !(distribution in ["mantic"]))
+      (architecture in ["arm64", "ppc64el", "s390x"] && !(distribution in ["oracular"]))
     filter_pattern: &filter_pattern |
       ({arch-filter}) &&
       ({dist-filter}) &&
       ({filter})
     # lts_dist_filter: build older PostgreSQL server versions on all LTS releases
-    lts_dist_filter: &lts_dist_filter '!(distribution in ["mantic"])'
+    lts_dist_filter: &lts_dist_filter '!(distribution in ["oracular"])'
     git-branch: master
     upstream-branch: master
     reference-repo: ''
@@ -155,8 +155,8 @@
                     - trixie
                     - bookworm
                     - bullseye
+                    - oracular
                     - noble
-                    - mantic
                     - jammy
                     - focal
 
@@ -2321,8 +2321,8 @@
 # pg_dump 14 supports 8.0+, but pg_upgrade 14 really only 9.0+ (https://www.postgresql.org/message-id/flat/1973418.1657040382%40sss.pgh.pa.us#06cfe6e815abc1478d15ea51986d85f5)
 - project: { name: upgrade-9.0-14,  oldversion: 9.0, newversion: 14,  jobs: [ upgrade ], dist-filter: *lts_dist_filter, arch-filter: 'architecture!="arm64"' }
 # pg_dump 15/16 supports 9.2+
-- project: { name: upgrade-9.2-16,  oldversion: 9.2, newversion: 16,  jobs: [ upgrade ], dist-filter: '!(distribution in ["mantic"])' }
-- project: { name: upgrade-9.2-17,  oldversion: 9.2, newversion: 15,  jobs: [ upgrade ], dist-filter: '!(distribution in ["mantic"])' }
+- project: { name: upgrade-9.2-16,  oldversion: 9.2, newversion: 16,  jobs: [ upgrade ], dist-filter: '!(distribution in ["oracular"])' }
+- project: { name: upgrade-9.2-17,  oldversion: 9.2, newversion: 15,  jobs: [ upgrade ], dist-filter: '!(distribution in ["oracular"])' }
 - project: { name: upgrade-9.4-11,  oldversion: 9.4, newversion: 11,  jobs: [ upgrade ], dist-filter: *lts_dist_filter }
 - project: { name: upgrade-9.6-13,  oldversion: 9.6, newversion: 13,  jobs: [ upgrade ], dist-filter: *lts_dist_filter }
 
diff --git a/pgapt.conf b/pgapt.conf
index 242521c..dc365d9 100644
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -7,13 +7,13 @@ PG_VERSIONS="10 11 12 13 14 15 16 17 18" # all server versions >= 10 (what we bu
 PG_ALL_VERSIONS="8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 $PG_VERSIONS" # all versions (which server packages we build on LTS dists)
 # supported dists: actively updated
 PG_SUPPORTED_DISTS="sid trixie bookworm bullseye \
-noble mantic jammy focal"
+oracular noble jammy focal"
 # repository dists: kept in repository config
 PG_REPOSITORY_DISTS="sid trixie bookworm bullseye buster \
-noble mantic jammy focal"
+oracular noble mantic jammy focal"
 # archive dists: all distributions (used in apt.postgresql.org.sh)
 PG_ARCHIVE_DISTS="sid trixie bookworm bullseye buster stretch jessie wheezy squeeze lenny etch \
-noble mantic lunar kinetic jammy impish hirsute groovy focal eoan disco cosmic bionic zesty xenial wily utopic saucy precise lucid"
+oracular noble mantic lunar kinetic jammy impish hirsute groovy focal eoan disco cosmic bionic zesty xenial wily utopic saucy precise lucid"
 
 set_dist_vars () { # args: $1 = distribution [$2 = architecture]
   ARCHS="amd64 arm64 ppc64el s390x" # default set of supported architectures
@@ -33,6 +33,7 @@ set_dist_vars () { # args: $1 = distribution [$2 = architecture]
     lenny)    PGDG_TAG="50"    DISTRO="debian" RELEASE="5.0" ;;
     etch)     PGDG_TAG="40"    DISTRO="debian" RELEASE="4.1" ;;
     # Ubuntu
+    oracular) PGDG_TAG="24.10" DISTRO="ubuntu" RELEASE="24.10"                 ARCHS="amd64"                          COMPONENTS="main $PG_VERSIONS" ;;
     noble)    PGDG_TAG="24.04" DISTRO="ubuntu" RELEASE="24.04" ;;
     mantic)   PGDG_TAG="23.10" DISTRO="ubuntu" RELEASE="23.10"                 ARCHS="amd64"                          COMPONENTS="main $PG_VERSIONS" ;;
     lunar)    PGDG_TAG="23.04" DISTRO="ubuntu" RELEASE="23.04"                 ARCHS="amd64"                          COMPONENTS="main $PG_VERSIONS" ;;
diff --git a/repo/conf/distributions b/repo/conf/distributions
index 66b2e05..a34a59b 100644
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -243,6 +243,55 @@ Contents: percomponent nocompatsymlink
 NotAutomatic: yes
 ButAutomaticUpgrades: yes
 
+Codename: oracular-pgdg
+Suite: oracular-pgdg
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 10 11 12 13 14 15 16 17 18
+SignWith: ACCC4CF8
+Log: oracular-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: oracular-pgdg-testing
+Suite: oracular-pgdg-testing
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 10 11 12 13 14 15 16 17 18
+SignWith: ACCC4CF8
+Log: oracular-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: oracular-pgdg-snapshot
+Suite: oracular-pgdg-snapshot
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 10 11 12 13 14 15 16 17 18
+SignWith: ACCC4CF8
+Log: oracular-pgdg-snapshot.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: noble-pgdg
 Suite: noble-pgdg
 Origin: apt.postgresql.org
diff --git a/repo/conf/incoming b/repo/conf/incoming
index 9e39a78..f2a8611 100644
--- a/repo/conf/incoming
+++ b/repo/conf/incoming
@@ -12,6 +12,7 @@ Allow:
  bookworm-pgdg>bookworm-pgdg-testing
  bullseye-pgdg>bullseye-pgdg-testing
  buster-pgdg>buster-pgdg-testing
+ oracular-pgdg>oracular-pgdg-testing
  noble-pgdg>noble-pgdg-testing
  mantic-pgdg>mantic-pgdg-testing
  jammy-pgdg>jammy-pgdg-testing
@@ -31,6 +32,7 @@ Allow:
  bookworm-pgdg>bookworm-pgdg-snapshot
  bullseye-pgdg>bullseye-pgdg-snapshot
  buster-pgdg>buster-pgdg-snapshot
+ oracular-pgdg>oracular-pgdg-snapshot
  noble-pgdg>noble-pgdg-snapshot
  mantic-pgdg>mantic-pgdg-snapshot
  jammy-pgdg>jammy-pgdg-snapshot