From 184469cd08fcc055553c971102718e18b948b2d6 Mon Sep 17 00:00:00 2001
From: Christoph Berg <myon@debian.org>
Date: Thu, 5 Sep 2024 15:25:19 +0200
Subject: [PATCH] Remove i386 from jenkins config

---
 jenkins/pgapt-jobs.yaml | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index cc0a806..ae87d2f 100644
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -28,13 +28,11 @@
     arch-filter: 'true'
     # distribution/architecture combinations:
     # amd64 on all dists
-    # i386 on sid; no i386 on newly added dists
     # arm64/ppc64el/s390x on all dists except non-LTS Ubuntu
     filter: &filter |
       architecture=="amd64" ||
       distribution=="sid" ||
-      (architecture in ["arm64", "ppc64el", "s390x"] && !(distribution in ["mantic"])) ||
-      ((architecture in ["arm64", "i386"]) && (distribution in ["buster"]))
+      (architecture in ["arm64", "ppc64el", "s390x"] && !(distribution in ["mantic"]))
     filter_pattern: &filter_pattern |
       ({arch-filter}) &&
       ({dist-filter}) &&
@@ -139,7 +137,6 @@
             values: &arch_list
                     - amd64
                     - arm64
-                    - i386
                     - ppc64el
                     - s390x
     arch_axis_pg_devel: &arch_axis_pg_devel
@@ -752,7 +749,6 @@
                     name: architecture
                     values:
                       - amd64
-                      - i386
         triggers:
                 - timed: "H */6 * * *"
         builders:
@@ -1212,7 +1208,7 @@
 - project:
         name: oracle-fdw
         git-url: https://salsa.debian.org/postgresql/oracle-fdw.git
-        arch-filter: 'architecture in ["amd64", "arm64", "i386", "s390x"]'
+        arch-filter: 'architecture in ["amd64", "arm64", "s390x"]'
         jobs:
                 - git-packages-with-beta
 
@@ -1220,7 +1216,7 @@
         name: oracle-libs
         git-url: https://salsa.debian.org/postgresql/oracle-libs.git
         # architectures supported by instant client
-        arch-filter: 'architecture in ["amd64", "arm64", "i386", "s390x"]'
+        arch-filter: 'architecture in ["amd64", "arm64", "s390x"]'
         jobs:
                 - git-packages
 
@@ -1444,7 +1440,7 @@
         name: pgfaceting
         git-url: https://salsa.debian.org/postgresql/pgfaceting.git
         # package is arch:all, but match pg-roaringbitmap architectures for testing
-        arch-filter: '!(architecture in ["i386", "s390x"])'
+        arch-filter: '!(architecture in ["s390x"])'
         jobs:
                 - git-packages-with-beta
 
@@ -1546,9 +1542,8 @@
         name: pgloader
         git-url: https://github.com/dimitri/pgloader.git
         # ppc64el doesn't have sbcl on the older Debian dists, and not on older Ubuntus at all
-        # i386 excluded on cl-ironclad maintainer request (#1077220)
         # s390x doesn't have sbcl
-        arch-filter: '!(architecture=="ppc64el" && distribution in ["jammy", "focal"] || architecture in ["i386", "s390x"])'
+        arch-filter: '!(architecture=="ppc64el" && distribution in ["jammy", "focal"] || architecture in ["s390x"])'
         jobs:
                 - git-packages
 
@@ -1614,7 +1609,7 @@
 - project:
         name: pg-roaringbitmap
         git-url: https://salsa.debian.org/postgresql/pg-roaringbitmap.git
-        arch-filter: '!(architecture in ["i386", "s390x"])'
+        arch-filter: '!(architecture in ["s390x"])'
         jobs:
                 - git-packages-with-beta
 
@@ -1985,7 +1980,6 @@
         name: postgresql-12-age
         git-url: https://salsa.debian.org/postgresql/postgresql-age.git
         git-branch: 12
-        arch-filter: 'architecture!="i386"'
         jobs:
                 - git-packages
 
@@ -1993,7 +1987,6 @@
         name: postgresql-13-age
         git-url: https://salsa.debian.org/postgresql/postgresql-age.git
         git-branch: 13
-        arch-filter: 'architecture!="i386"'
         jobs:
                 - git-packages
 
@@ -2001,7 +1994,6 @@
         name: postgresql-14-age
         git-url: https://salsa.debian.org/postgresql/postgresql-age.git
         git-branch: 14
-        arch-filter: 'architecture!="i386"'
         jobs:
                 - git-packages
 
@@ -2009,7 +2001,6 @@
         name: postgresql-15-age
         git-url: https://salsa.debian.org/postgresql/postgresql-age.git
         git-branch: 15
-        arch-filter: 'architecture!="i386"'
         jobs:
                 - git-packages
 
@@ -2017,7 +2008,6 @@
         name: postgresql-16-age
         git-url: https://salsa.debian.org/postgresql/postgresql-age.git
         git-branch: 16
-        arch-filter: 'architecture!="i386"'
         jobs:
                 - git-packages
 
@@ -2051,7 +2041,7 @@
 - project:
         name: postgresql-hll
         git-url: https://salsa.debian.org/postgresql/postgresql-hll.git
-        arch-filter: '!(architecture in ["i386", "s390x"])'
+        arch-filter: '!(architecture in ["s390x"])'
         jobs:
                 - git-packages-with-beta
 
@@ -2083,10 +2073,9 @@
 - project:
         name: postgresql-pljava
         git-url: https://salsa.debian.org/postgresql/postgresql-pljava.git
-        # test failures on i386, disable for now
         # https://github.com/tada/pljava/issues/338
         # s390x also fails: https://github.com/tada/pljava/issues/469
-        arch-filter: '!(architecture in ["i386", "ppc64el", "s390x"])'
+        arch-filter: '!(architecture in ["ppc64el", "s390x"])'
         jobs:
                 - git-packages-with-beta
 
@@ -2275,7 +2264,7 @@
 - project:
         name: timescaledb
         git-url: https://salsa.debian.org/postgresql/timescaledb.git
-        arch-filter: '!(architecture in ["i386", "s390x"])'
+        arch-filter: '!(architecture in ["s390x"])'
         jobs:
                 - git-packages-with-beta
 
-- 
2.39.5