Add postgresql-18

diff --git a/jenkins/packages b/jenkins/packages
index 0799cf183e6ac5ea53222184f33ea83a9b37cd87..bd5dc41f974b4a233fc89d859993faaae72e7ee3 100644 (file)
--- a/jenkins/packages
+++ b/jenkins/packages
@@ -135,6 +135,7 @@ postgresql-15-age
 postgresql-16
 postgresql-16-age
 postgresql-17
+postgresql-18
 postgresql-8.2
 postgresql-8.3
 postgresql-8.4

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 16bb65395def54f4609517f9ef686b795f56b724..d107b8bb6a4410492c6b5c64c421c350c7c4b00a 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -1973,6 +1973,14 @@
         jobs:
                 - postgresql-server-jobs
 
+- project:
+        name: postgresql-18
+        git-branch: 18
+        upstream-branch: master
+        snapshot-cron: 'H H/6 * * *'
+        jobs:
+                - postgresql-server-jobs
+
 - project:
         name: postgresql-12-age
         git-url: https://salsa.debian.org/postgresql/postgresql-age.git
@@ -2324,6 +2332,7 @@
 - project: { name: upgrade-14-15,   oldversion: 14,  newversion: 15,  jobs: [ upgrade ] }
 - project: { name: upgrade-15-16,   oldversion: 15,  newversion: 16,  jobs: [ upgrade ] }
 - project: { name: upgrade-16-17,   oldversion: 16,  newversion: 17,  jobs: [ upgrade ] }
+- project: { name: upgrade-17-18,   oldversion: 17,  newversion: 18,  jobs: [ upgrade ] }
 
 # larger jumps:
 # 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)

diff --git a/pgapt.conf b/pgapt.conf
index 54fb17845f41ed1938b2067db2998166418e762b..2d0d93f2426b5a81fa38c32354a03c0e7c7aa823 100644 (file)
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -2,8 +2,8 @@
 PG_OLDEST_VERSION=9.6
 PG_MAIN_VERSION=16
 PG_BETA_VERSION=17
-PG_DEVEL_VERSION=17
-PG_VERSIONS="10 11 12 13 14 15 16 17" # all server versions >= 10 (what we build extensions for)
+PG_DEVEL_VERSION=18
+PG_VERSIONS="10 11 12 13 14 15 16 17 18" # all server versions >= 10 (what we build extensions for)
 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 buster \

diff --git a/repo/conf/distributions b/repo/conf/distributions
index 9cbd023ae4d64ad1c77cb6d1b883156f450cb77b..66b2e05bb3a38d3c04ecc397c127b13201e1b872 100644 (file)
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -3,7 +3,7 @@ Suite: sid-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 i386 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: sid-pgdg.log
 Uploaders: uploaders
@@ -18,7 +18,7 @@ Suite: sid-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 i386 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: sid-pgdg-testing.log
 Uploaders: uploaders
@@ -35,7 +35,7 @@ Suite: sid-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 i386 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: sid-pgdg-snapshot.log
 Uploaders: uploaders
@@ -52,7 +52,7 @@ Suite: trixie-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: trixie-pgdg.log
 Uploaders: uploaders
@@ -67,7 +67,7 @@ Suite: trixie-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: trixie-pgdg-testing.log
 Uploaders: uploaders
@@ -84,7 +84,7 @@ Suite: trixie-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: trixie-pgdg-snapshot.log
 Uploaders: uploaders
@@ -101,7 +101,7 @@ Suite: bookworm-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: bookworm-pgdg.log
 Uploaders: uploaders
@@ -116,7 +116,7 @@ Suite: bookworm-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: bookworm-pgdg-testing.log
 Uploaders: uploaders
@@ -133,7 +133,7 @@ Suite: bookworm-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: bookworm-pgdg-snapshot.log
 Uploaders: uploaders
@@ -150,7 +150,7 @@ Suite: bullseye-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: bullseye-pgdg.log
 Uploaders: uploaders
@@ -165,7 +165,7 @@ Suite: bullseye-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: bullseye-pgdg-testing.log
 Uploaders: uploaders
@@ -182,7 +182,7 @@ Suite: bullseye-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: bullseye-pgdg-snapshot.log
 Uploaders: uploaders
@@ -199,7 +199,7 @@ Suite: buster-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 i386 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: buster-pgdg.log
 Uploaders: uploaders
@@ -214,7 +214,7 @@ Suite: buster-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 i386 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: buster-pgdg-testing.log
 Uploaders: uploaders
@@ -231,7 +231,7 @@ Suite: buster-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 i386 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: buster-pgdg-snapshot.log
 Uploaders: uploaders
@@ -248,7 +248,7 @@ Suite: noble-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: noble-pgdg.log
 Uploaders: uploaders
@@ -263,7 +263,7 @@ Suite: noble-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: noble-pgdg-testing.log
 Uploaders: uploaders
@@ -280,7 +280,7 @@ Suite: noble-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: noble-pgdg-snapshot.log
 Uploaders: uploaders
@@ -297,7 +297,7 @@ Suite: mantic-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64
-Components: main 10 11 12 13 14 15 16 17
+Components: main 10 11 12 13 14 15 16 17 18
 SignWith: ACCC4CF8
 Log: mantic-pgdg.log
 Uploaders: uploaders
@@ -312,7 +312,7 @@ Suite: mantic-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
+Components: main 10 11 12 13 14 15 16 17 18
 SignWith: ACCC4CF8
 Log: mantic-pgdg-testing.log
 Uploaders: uploaders
@@ -329,7 +329,7 @@ Suite: mantic-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
+Components: main 10 11 12 13 14 15 16 17 18
 SignWith: ACCC4CF8
 Log: mantic-pgdg-snapshot.log
 Uploaders: uploaders
@@ -346,7 +346,7 @@ Suite: jammy-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: jammy-pgdg.log
 Uploaders: uploaders
@@ -361,7 +361,7 @@ Suite: jammy-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: jammy-pgdg-testing.log
 Uploaders: uploaders
@@ -378,7 +378,7 @@ Suite: jammy-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: jammy-pgdg-snapshot.log
 Uploaders: uploaders
@@ -395,7 +395,7 @@ Suite: focal-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: focal-pgdg.log
 Uploaders: uploaders
@@ -410,7 +410,7 @@ Suite: focal-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: focal-pgdg-testing.log
 Uploaders: uploaders
@@ -427,7 +427,7 @@ Suite: focal-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
 Architectures: source amd64 arm64 ppc64el s390x
-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 16 17
+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 16 17 18
 SignWith: ACCC4CF8
 Log: focal-pgdg-snapshot.log
 Uploaders: uploaders