Add Ubuntu lunar (23.04)

diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source
index 49388f657fec8b78789b417fc3363f31c3b287d3..c7dc786391cd335026528390a180016b774518e3 100755 (executable)
--- a/jenkins/generate-pgdg-source
+++ b/jenkins/generate-pgdg-source
@@ -208,7 +208,7 @@ case $PACKAGE in
       xenial) debhelper_compat 10 ;;
       bionic) debhelper_compat 12 ;;
       eoan) debhelper_compat 12 ;;
-      focal|groovy|hirsute|impish|jammy|kinetic) debhelper_compat 13 ;;
+      focal|groovy|hirsute|impish|jammy|kinetic|lunar) debhelper_compat 13 ;;
     esac
     ;;
   *) # debhelper without backport
@@ -219,7 +219,7 @@ case $PACKAGE in
       xenial) debhelper_compat 9 ;;
       bionic) debhelper_compat 11 ;;
       eoan|focal) debhelper_compat 12 ;;
-      groovy|hirsute|impish|jammy|kinetic) debhelper_compat 13 ;;
+      groovy|hirsute|impish|jammy|kinetic|lunar) debhelper_compat 13 ;;
     esac
     ;;
 esac
@@ -280,7 +280,7 @@ case $PACKAGE in
 
   vip-manager)
     case ${distribution:-} in
-      bullseye|buster|kinetic|jammy|focal|bionic)
+      bullseye|buster|lunar|kinetic|jammy|focal|bionic)
         sed -i -e 's/^#\(.*consul\)/\1/' debian/control
         sed -i -e '/disable-consul/d' debian/patches/series
         TWEAK+=("Re-enable consul.")

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 1dae5f1837895ec635bb5bd09134d8cf42f145b0..d130157a6770e3f114df3f6515ef7af5975b6794 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -30,10 +30,10 @@
     # amd64 on all dists
     # i386 on sid; no i386 on newly added dists
     # arm64/ppc64el on all dists except non-LTS Ubuntu
-    filter: &filter 'architecture=="amd64" || distribution=="sid" || (architecture=="arm64" && !(distribution in ["kinetic"])) || (architecture=="i386" && (distribution in ["buster", "bionic"])) || (architecture=="ppc64el" && !(distribution in ["kinetic"]))'
+    filter: &filter 'architecture=="amd64" || distribution=="sid" || (architecture=="arm64" && !(distribution in ["lunar", "kinetic"])) || (architecture=="i386" && (distribution in ["buster", "bionic"])) || (architecture=="ppc64el" && !(distribution in ["lunar", "kinetic"]))'
     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 ["kinetic"])'
+    lts_dist_filter: &lts_dist_filter '!(distribution in ["lunar", "kinetic"])'
     git-branch: master
     upstream-branch: master
     reference-repo: ''
@@ -146,29 +146,7 @@
                     - bookworm
                     - bullseye
                     - buster
-                    - kinetic
-                    - jammy
-                    - focal
-                    - bionic
-    dist_axis_pg_beta: &dist_axis_pg_beta # distributions to build PG-beta module packages for
-            type: user-defined
-            name: distribution
-            values:
-                    - sid
-                    - bookworm
-                    - bullseye
-                    - buster
-                    - kinetic
-                    - jammy
-                    - focal
-                    - bionic
-    dist_axis_pg_devel: &dist_axis_pg_devel # distributions to build PG devel packages for
-            type: user-defined
-            name: distribution
-            values:
-                    - sid
-                    - bullseye
-                    - buster
+                    - lunar
                     - kinetic
                     - jammy
                     - focal
@@ -483,9 +461,6 @@
         <<: *binaries_template
         name: '{name}-binaries-beta'
         id: 'binaries-beta'
-        axes:
-                - axis: *arch_axis
-                - axis: *dist_axis_pg_beta
         parameters:
                 - string: *supported_versions_param_beta
                 - string: *deb_build_options_param
@@ -554,9 +529,6 @@
         parameters:
                 - string: *PG_SUPPORTED_VERSIONS
                 - matrix-combinations: *matrix_combination_parameter
-        axes:
-                - axis: *arch_axis
-                - axis: *dist_axis_pg_beta
         triggers:
         #        - timed: "H H H * *"
 

diff --git a/pgapt.conf b/pgapt.conf
index 7916e069ec53d4fad107cea5d503d8315361eb4a..b1166684662dd7f3d72125bf415bf543aa660803 100644 (file)
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -5,13 +5,13 @@ PG_MAIN_VERSION=15
 PG_DEVEL_VERSION=16
 # supported dists: actively updated
 PG_SUPPORTED_DISTS="sid bookworm bullseye buster \
-kinetic jammy focal bionic"
+lunar kinetic jammy focal bionic"
 # repository dists: kept in repository config
 PG_REPOSITORY_DISTS="sid bookworm bullseye buster \
-kinetic jammy focal bionic"
+lunar kinetic jammy focal bionic"
 # archive dists: all distributions (used in apt.postgresql.org.sh)
 PG_ARCHIVE_DISTS="sid bookworm bullseye buster stretch jessie wheezy squeeze lenny etch \
-kinetic jammy impish hirsute groovy focal eoan disco cosmic bionic zesty xenial wily utopic saucy precise lucid"
+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]
   HAS_BACKPORTS=""
@@ -28,6 +28,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
+    lunar)    PGDG_TAG="23.04" DISTRO="ubuntu" RELEASE="23.04"                 ARCHS="amd64"                    COMPONENTS="main                                         10 11 12 13 14 15 16" ;;
     kinetic)  PGDG_TAG="22.10" DISTRO="ubuntu" RELEASE="22.10"                 ARCHS="amd64"                    COMPONENTS="main                                         10 11 12 13 14 15 16" ;;
     jammy)    PGDG_TAG="22.04" DISTRO="ubuntu" RELEASE="22.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 16" ;;
     impish)   PGDG_TAG="21.10" DISTRO="ubuntu" RELEASE="21.10"                 ARCHS="amd64"                    COMPONENTS="main                                     9.6 10 11 12 13 14 15 16" ;;

diff --git a/repo/conf/distributions b/repo/conf/distributions
index 6ef8dc2e15ddb99bba3f01aadd8e47589eb3d07a..08662066c4fae4ce11065f568400a58225369637 100644 (file)
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -194,6 +194,55 @@ Contents: percomponent nocompatsymlink
 NotAutomatic: yes
 ButAutomaticUpgrades: yes
 
+Codename: lunar-pgdg
+Suite: lunar-pgdg
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 10 11 12 13 14 15 16
+SignWith: ACCC4CF8
+Log: lunar-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: lunar-pgdg-testing
+Suite: lunar-pgdg-testing
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 10 11 12 13 14 15 16
+SignWith: ACCC4CF8
+Log: lunar-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: lunar-pgdg-snapshot
+Suite: lunar-pgdg-snapshot
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64
+Components: main 10 11 12 13 14 15 16
+SignWith: ACCC4CF8
+Log: lunar-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: kinetic-pgdg
 Suite: kinetic-pgdg
 Origin: apt.postgresql.org

diff --git a/repo/conf/incoming b/repo/conf/incoming
index b13e91d35131d169deb35ef43c628f6dfdae9bce..e7aa614ce7c536555ed47452e9f78c3f37fc765b 100644 (file)
--- a/repo/conf/incoming
+++ b/repo/conf/incoming
@@ -11,6 +11,7 @@ Allow:
  bookworm-pgdg>bookworm-pgdg-testing
  bullseye-pgdg>bullseye-pgdg-testing
  buster-pgdg>buster-pgdg-testing
+ lunar-pgdg>lunar-pgdg-testing
  kinetic-pgdg>kinetic-pgdg-testing
  jammy-pgdg>jammy-pgdg-testing
  focal-pgdg>focal-pgdg-testing
@@ -29,6 +30,7 @@ Allow:
  bookworm-pgdg>bookworm-pgdg-snapshot
  bullseye-pgdg>bullseye-pgdg-snapshot
  buster-pgdg>buster-pgdg-snapshot
+ lunar-pgdg>lunar-pgdg-snapshot
  kinetic-pgdg>kinetic-pgdg-snapshot
  jammy-pgdg>jammy-pgdg-snapshot
  focal-pgdg>focal-pgdg-snapshot