New x86 build host provided by PostgreSQL infra

diff --git a/jenkins/ansible/hosts b/jenkins/ansible/hosts
index 77f856fd117dbdce2be9ca4b8fc5abf76f1790bb..46e3d77f157e9822ef9e1080675321167188883a 100644 (file)
--- a/jenkins/ansible/hosts
+++ b/jenkins/ansible/hosts
@@ -1,8 +1,6 @@
 pgdgbuild.dus.dg-i.net chroot_dir=/home/chroot.buexcl run_opts="size=20G"
+pgx86 chroot_dir=/home/chroot run_opts="size=50G"
 pgdgbuild-arm64 chroot_dir=/home/chroot run_opts="size=50G"
 # ppc64el: 24GB is not enough to build postgis with 4 workers (huge B-Ds)
 pgdgbuild-ppc64el chroot_dir=/home/chroot run_opts="size=100G,nr_inodes=800k"
 pgs390x chroot_dir=/home/chroot run_opts="size=100G,nr_inodes=800k"
-pgapt1 chroot_dir=/home/chroot run_opts="size=20G"
-pgapt2 chroot_dir=/home/chroot run_opts="size=20G"
-pgapt3 chroot_dir=/home/chroot run_opts="size=20G"

diff --git a/jenkins/ansible/setup-buildd.yml b/jenkins/ansible/setup-buildd.yml
index e1a0c89c9510976269cd11eab856c6b9600fe02b..88496189b8c95194e74e814e8e8e530bfbe523ae 100755 (executable)
--- a/jenkins/ansible/setup-buildd.yml
+++ b/jenkins/ansible/setup-buildd.yml
@@ -26,7 +26,7 @@
       - sbuild
       - schroot
       - sudo
-      - ubuntu-archive-keyring
+      #- ubuntu-archive-keyring
       - vim
 
   - name: remove packages
@@ -37,7 +37,8 @@
       state: absent
 
   - name: apt.postgresql.org repository
-    shell: echo yes | /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -h atalia.postgresql.org -st
+    #shell: echo yes | /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -h atalia.postgresql.org -st
+    shell: echo yes | /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh
     args:
       creates: /etc/apt/sources.list.d/pgdg.sources
 

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 3abfe970be2c318a341c36090c168ae77fdfd238..40cd32623d645c14211b242039e16d1015745762 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -108,11 +108,13 @@
               - pgdgbuild-x86
               - pgdgbuild-ppc64el
               - s390x-1
+              - x86-1
     x86_slaves_axis: &x86_slaves_axis
             type: slave
             name: slave
             values:
               - pgdgbuild-x86
+              - x86-1
     arm64_slaves_axis: &arm64_slaves_axis
             type: slave
             name: slave