Remove i386 and buster/mantic from repository config

9 files changed, 21 insertions, 151 deletions

diff --git a/jenkins/builddebcheck-pgapt b/jenkins/builddebcheck-pgapt
index 14af225..a6903dd 100755
--- a/jenkins/builddebcheck-pgapt
+++ b/jenkins/builddebcheck-pgapt
@@ -85,9 +85,6 @@ fi
 
 # packages not tested on specific architectures
 case $architecture in
-  i386)
-    remove_packages $MAINSRC h3-pg pgfaceting pg-roaringbitmap "postgresql-.*-age" timescaledb
-    ;;
   ppc64el)
     remove_packages $MAINSRC buildapp cffi cl-unicode pgloader sbcl plv8
     ;;
@@ -99,20 +96,13 @@ esac
 # packages not tested on certain dists
 # postgresql-11 needs llvm-15 (disabled via pkg.postgresql.nollvm, but let's not set that globally here)
 case $distribution in sid|trixie) remove_packages $MAINSRC postgresql-11 ;; esac
-# python-werkzeug needs DH 12 and python3-sphinx-issues
-case $distribution in
-  buster|stretch|eoan|disco|bionic|xenial)
-    remove_packages $MAINSRC python-werkzeug ;;
-esac
 # vip-manager needs newer Go version to compile, but .debs are copied to older dists
 case $distribution in
   buster|groovy|focal)
     remove_packages $MAINSRC vip-manager ;;
 esac
-# pg-ldap-sync prometheus-sql-exporter need buster-backports which got removed
-case $distribution in buster) remove_packages $MAINSRC pg-ldap-sync prometheus-sql-exporter ;; esac
 # zstd is too old on stretch, buster and bionic
-case $distribution in stretch|buster|bionic) PROFILES="pkg.postgresql.nozstd" ;; esac
+#case $distribution in stretch|buster|bionic) PROFILES="pkg.postgresql.nozstd" ;; esac
 
 # run builddebcheck
 BUILDDEBCHECK="dose-builddebcheck -v -f -e --deb-native-arch=$architecture ${PROFILES:+--deb-profiles=$PROFILES}"
diff --git a/jenkins/debcheck-pgapt b/jenkins/debcheck-pgapt
index ea2af33..ec8c017 100755
--- a/jenkins/debcheck-pgapt
+++ b/jenkins/debcheck-pgapt
@@ -53,7 +53,7 @@ MAINPKG=$(awk '/^Package:/ { print $2 }' $DISTSDIR/$DIST/main/binary-${architect
 
 # exclude packages not installable on some architectures
 case $architecture in
-  i386|s390x)
+  s390x)
     MAINPKG=$(echo "$MAINPKG" | grep -v "pgfaceting") # pg-roaringbitmap missing on s390x
     ;;
 esac
@@ -110,20 +110,12 @@ fi
 # ignore elephant-shed in bookworm and lunar (and older)
 MAINPKG=$(echo "$MAINPKG" | grep -Ev "^elephant-shed")
 
-case $distribution in
-  buster)
-    MAINPKG=$(echo "$MAINPKG" | grep -Ev "^omnidb") # needs backports, but buster-backports got removed
-    ;;
-esac
-
 # bpo
 if [ "$HAS_BACKPORTS" ]; then
-    echo "### Running debcheck: main, packages needing backports"
-    # pgdg-buildenv: depends on clang-6.0 in stretch (but we include amd64/i386 only in our repository, not ppc64el)
-    # omnidb: Needs Django 2.2 on buster
-    # e-s-tmate needs tmate 2.4 on buster
-    pkg=$(fold $(echo "$MAINPKG" | grep -Ee 'pgdg-buildenv' -e 'resource-agents-paf' -e 'postgresql-.*-pllua' -e 'omnidb-common' -e 'omnidb-server'))
+    #pkg=$(fold $(echo "$MAINPKG" | grep -Ee 'pgdg-buildenv' ))
+    pkg=""
     if [ "$pkg" ]; then
+      echo "### Running debcheck: main, packages needing backports"
       ( set -x; $DEBCHECK \
         --bg $LISTSDIR/../backports/*_dists_${distribution}-backports_main_binary-${architecture}_Packages \
         --fg $DISTSDIR/$DIST/main/binary-${architecture}/Packages \
@@ -132,7 +124,7 @@ if [ "$HAS_BACKPORTS" ]; then
     echo
 
     # exclude packages from further testing
-    MAINPKG=$(echo "$MAINPKG" | grep -Ev -e 'pgdg-buildenv' -e 'resource-agents-paf' -e 'postgresql-.*-pllua' -e 'omnidb-common' -e 'omnidb-server')
+    #MAINPKG=$(echo "$MAINPKG" | grep -Ev -e 'pgdg-buildenv' )
 fi
 
 # main
diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index b39e9e7..b81fa5a 100644
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -2171,9 +2171,8 @@
 - project:
         name: prometheus-sql-exporter
         git-url: https://salsa.debian.org/postgresql/prometheus-sql-exporter.git
-        # buster: needs newer golang-github-lib-pq-dev (backport exists)
         # bullseye, focal: needs golang-github-go-kit-log-dev
-        dist-filter: '!(distribution in ["buster", "bullseye", "focal"])'
+        dist-filter: '!(distribution in ["bullseye", "focal"])'
         backports: 'BACKPORTS=yes ' # golang-* backports on buster (needed for existing 0.4.0 packages in repo even when we don't build newer ones there)
         jobs:
                 - git-packages
diff --git a/jenkins/sbuild-package b/jenkins/sbuild-package
index c34c178..71dedf5 100755
--- a/jenkins/sbuild-package
+++ b/jenkins/sbuild-package
@@ -4,7 +4,7 @@
 # Input:
 #  .dsc source package in current directory
 #  JOB_NAME=$pkg-binaries or PACKAGE=pkg
-#  architecture=amd64/i386
+#  architecture=amd64/arm64/...
 #  distribution=foo (caveat: sbuild -d foo-pgdg will be called)
 #  optionally: DEB_BUILD_OPTIONS
 #  optionally: PG_SUPPORTED_VERSIONS (defaults to pgdg)
diff --git a/jenkins/schroot-config.sh b/jenkins/schroot-config.sh
index 8355ae0..8b8b185 100755
--- a/jenkins/schroot-config.sh
+++ b/jenkins/schroot-config.sh
@@ -16,16 +16,10 @@ for dir in . .. $HOME/apt.postgresql.org; do
   break
 done
 
-my_arch="$(dpkg --print-architecture)"
-case $my_arch in
-	amd64) ARCHS="amd64 i386" ;;
-	*) ARCHS="$my_arch" ;;
-esac
+arch="$(dpkg --print-architecture)"
 
 for dist in $PG_SUPPORTED_DISTS; do
-	for arch in $ARCHS; do
-
-		# if arguments are given, execute as command in enviroment
+		# if arguments are given, execute as command in environment
 		# ./schroot-config.sh ./sbuild-update.sh
 		if [ "$*" ]; then
 			echo "### distribution=$dist architecture=$arch ###"
@@ -43,15 +37,13 @@ for dist in $PG_SUPPORTED_DISTS; do
 			directory=/home/chroot/$dist-$arch
 			union-type=overlay
 			union-overlay-directory=/var/run
+			
 			EOF
-			[ $arch = i386 ] && echo "personality=linux32"
-			echo
 		)"
 
 		echo "[$dist-$arch]"
-		aliases="$dist-pgdg-$arch"
-		[ $arch = $my_arch ] && aliases="$aliases,$dist"
-		[ $dist = sid ] && [ $arch = $my_arch ] && aliases="$aliases,default"
+		aliases="$dist-pgdg-$arch,$dist"
+		[ $dist = sid ] && aliases="$aliases,default"
 		echo "aliases=$aliases"
 		echo "$body"
 		echo
@@ -63,5 +55,4 @@ for dist in $PG_SUPPORTED_DISTS; do
 		echo "profile=sbuild"
 		echo "$body"
 		echo
-	done
 done
diff --git a/pgapt-db/sql/pgdg_apt_data.sql b/pgapt-db/sql/pgdg_apt_data.sql
index f4fa3df..7c200c3 100644
--- a/pgapt-db/sql/pgdg_apt_data.sql
+++ b/pgapt-db/sql/pgdg_apt_data.sql
@@ -4,7 +4,7 @@ INSERT INTO architecture VALUES
     ('all'),
     ('amd64'),
     ('arm64'),
-    ('i386'),
-    ('ppc64el');
+    ('ppc64el'),
+    ('s390x');
 
 COMMIT;
diff --git a/pgapt.conf b/pgapt.conf
index 5d279b4..b4b09a7 100644
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -9,8 +9,8 @@ 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 ver
 PG_SUPPORTED_DISTS="sid trixie bookworm bullseye \
 oracular noble jammy focal"
 # repository dists: kept in repository config
-PG_REPOSITORY_DISTS="sid trixie bookworm bullseye buster \
-oracular noble mantic jammy focal"
+PG_REPOSITORY_DISTS="sid trixie bookworm bullseye \
+oracular noble 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 \
 oracular noble mantic lunar kinetic jammy impish hirsute groovy focal eoan disco cosmic bionic zesty xenial wily utopic saucy precise lucid"
@@ -21,7 +21,7 @@ set_dist_vars () { # args: $1 = distribution [$2 = architecture]
   HAS_BACKPORTS=""
   case $1 in
     # Debian
-    sid)      PGDG_TAG=""      DISTRO="debian" RELEASE="unstable"              ARCHS="amd64 arm64 i386 ppc64el s390x" ;;
+    sid)      PGDG_TAG=""      DISTRO="debian" RELEASE="unstable" ;;
     trixie)   PGDG_TAG="130"   DISTRO="debian" RELEASE="13" ;;
     bookworm) PGDG_TAG="120"   DISTRO="debian" RELEASE="12" ;;
     bullseye) PGDG_TAG="110"   DISTRO="debian" RELEASE="11"    HAS_BACKPORTS=1 ;;
diff --git a/repo/conf/distributions b/repo/conf/distributions
index a34a59b..54f374c 100644
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -2,7 +2,7 @@ Codename: sid-pgdg
 Suite: sid-pgdg
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 arm64 i386 ppc64el s390x
+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 18
 SignWith: ACCC4CF8
 Log: sid-pgdg.log
@@ -17,7 +17,7 @@ Codename: sid-pgdg-testing
 Suite: sid-pgdg-testing
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 arm64 i386 ppc64el s390x
+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 18
 SignWith: ACCC4CF8
 Log: sid-pgdg-testing.log
@@ -34,7 +34,7 @@ Codename: sid-pgdg-snapshot
 Suite: sid-pgdg-snapshot
 Origin: apt.postgresql.org
 Label: PostgreSQL for Debian/Ubuntu repository
-Architectures: source amd64 arm64 i386 ppc64el s390x
+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 18
 SignWith: ACCC4CF8
 Log: sid-pgdg-snapshot.log
@@ -194,55 +194,6 @@ Contents: percomponent nocompatsymlink
 NotAutomatic: yes
 ButAutomaticUpgrades: yes
 
-Codename: buster-pgdg
-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 18
-SignWith: ACCC4CF8
-Log: buster-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: buster-pgdg-testing
-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 18
-SignWith: ACCC4CF8
-Log: buster-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: buster-pgdg-snapshot
-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 18
-SignWith: ACCC4CF8
-Log: buster-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: oracular-pgdg
 Suite: oracular-pgdg
 Origin: apt.postgresql.org
@@ -341,55 +292,6 @@ Contents: percomponent nocompatsymlink
 NotAutomatic: yes
 ButAutomaticUpgrades: yes
 
-Codename: mantic-pgdg
-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 18
-SignWith: ACCC4CF8
-Log: mantic-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: mantic-pgdg-testing
-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 18
-SignWith: ACCC4CF8
-Log: mantic-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: mantic-pgdg-snapshot
-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 18
-SignWith: ACCC4CF8
-Log: mantic-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: jammy-pgdg
 Suite: jammy-pgdg
 Origin: apt.postgresql.org
diff --git a/repo/conf/incoming b/repo/conf/incoming
index f2a8611..8f856b5 100644
--- a/repo/conf/incoming
+++ b/repo/conf/incoming
@@ -11,10 +11,8 @@ Allow:
  trixie-pgdg>trixie-pgdg-testing
  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
  focal-pgdg>focal-pgdg-testing
 
@@ -31,10 +29,8 @@ Allow:
  trixie-pgdg>trixie-pgdg-snapshot
  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
  focal-pgdg>focal-pgdg-snapshot