Move pgdgbuild.dus.dg-i.net to jengus.postgresql.org

diff --git a/jenkins/.gitignore b/jenkins/.gitignore
index 031afb7344f51d1fd8d82ad8fd1e960a1a66fc39..54bd02eed419bc46058468a2179ba8007940b6b9 100644 (file)
--- a/jenkins/.gitignore
+++ b/jenkins/.gitignore
@@ -1,4 +1,3 @@
 atalia.postgresql.org/
-debsso.p12
 output.new/
 output.old/

diff --git a/jenkins/Makefile b/jenkins/Makefile
index 5c7a97508513c63e45a3e1e248e14abb72c68377..2f0d32cfe46d460880d60559bd556f2c7df8c3d1 100644 (file)
--- a/jenkins/Makefile
+++ b/jenkins/Makefile
@@ -14,14 +14,10 @@ test:
        mv output.tmp output.new
        test -d output.old && diff -urp output.old output.new || true
 
-update:
+update: $(HOME)/.config/jenkins_jobs/jenkins_jobs.ini
        @echo "*** Updating Jenkins from $(JOBS) ***"
        $(JJB) update $(JOBS)
 
-update-pgdgbuild:
-       @echo "*** Updating Jenkins from $(JOBS) ***"
-       $(JJB) --conf jenkins_jobs.ini update $(JOBS)
-
 # package lists
 lists: packages packages.modules packages.betatests packages.backports packages.backports_runtime
 packages: pgapt-jobs.yaml

diff --git a/jenkins/README.jenkins b/jenkins/README.jenkins
index 4df311583c0552118587c8d7a84ef23782bb2127..4d585bda2baefd4ddef7bd98b38da0dda92a37ca 100644 (file)
--- a/jenkins/README.jenkins
+++ b/jenkins/README.jenkins
@@ -1,30 +1,34 @@
 Jenkins
 =======
 
-Plugins required
-----------------
+## Plugins required
+
 Build Name and Description Setter
-Collapsing Console Sections Plugin
-Copy Artifact Plugin
-Git Plugin
-Green Balls Plugin
-IRC Plugin
-Matrix Combinations Plugin (aka Matrix Configuration Parameter)
+Collapsing Console Sections
+Copy Artifact
+Git
+#Green Balls
+IRC
+Matrix Project
+Matrix Combinations (aka Matrix Configuration Parameter)
 Multiple SCMs
-Node and Label parameter plugin
-Parameterized Trigger Plugin
-Priority Sorter Plugin
-Reverse Proxy Auth Plugin
-SCM Sync Plugin
-Strict Crumbs Issuer Plugin ("Check Session ID" off for compatibility with jenkins-job-builder)
-Text-finder Plugin
-Throttle Concurrent Builds
-Timestamper Plugin
+Node and Label parameter
+Parameterized Trigger
+#Priority Sorter
+#Reverse Proxy Auth
+#SCM Sync
+#Strict Crumbs Issuer ("Check Session ID" off for compatibility with jenkins-job-builder)
+Text-finder
+#Throttle Concurrent Builds
+Timestamper
 Pipeline: Build Step
-Pipeline Model Definition Plugin
-Pipeline Stage View Plugin
+Pipeline: Declarative
+#Pipeline Model Definition
+Pipeline: Stage View
+Workspace Cleanup
+View Job Filters
 
-## Collapsing Console Sections Plugin config for sbuild logs
+## Collapsing Console Sections config for sbuild logs
 
 Section name: {1}
 Section starts with: ^\| (.+[a-z])  +\|$
@@ -44,8 +48,8 @@ Section ends with: ^### End .* ###$
 
 (One-per-line ending: doesn't matter)
 
-Priority Sorter Plugin config
------------------------------
+## Priority Sorter config
+
 Global config: 5 priority levels, 3 default
 
 Job Priorities config:

diff --git a/jenkins/ansible/hosts b/jenkins/ansible/hosts
index b60b38e346ec34f87f383d2f59d8512b787c0cee..70660e4732b4ebe1ed904744943fdbb216802678 100644 (file)
--- a/jenkins/ansible/hosts
+++ b/jenkins/ansible/hosts
@@ -1,4 +1,3 @@
-#pgdgbuild.dus.dg-i.net run_opts="size=20G"
 pgx86 run_opts="size=50G"
 pgarm64 run_opts="size=50G"
 # ppc64el: 24GB is not enough to build postgis with 4 workers (huge B-Ds)

diff --git a/jenkins/ansible/setup-buildd.yml b/jenkins/ansible/setup-buildd.yml
index 31172fde46feb10b205b43b93f1252218efaae4a..c6a1ebb9d9164baa400b5fb119617df2173dd2d7 100755 (executable)
--- a/jenkins/ansible/setup-buildd.yml
+++ b/jenkins/ansible/setup-buildd.yml
@@ -95,11 +95,6 @@
       groups: sbuild,sudo
       shell: /bin/bash
 
-  - name: buildd authorized_keys
-    authorized_key:
-      user: buildd
-      key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEbRuNmXd2MhrSN7RTINoj1kYZQ8iRKvhvGCE8jqgMj1UpKL8XGIiD3ouGqIYt1eDaDvMoSGEwYVYZHbkRz7U9Kpb2n7fenOhRTT9jkE4p4eYnYbhV81ZB487IiKBAkIyGk9+J6XbQO4dnLY+XDufGIKXkPwdYkw2otvxfSI+TjJQ7tRw4BHn9+UsPPKRYSO/i7d/jgZcthVWsRPdDk54dRI2uDClXob7rJjazCWPVBH8VDXbbM2q5xIgVAG812GXAXXksAljdQU05lwOgVo5foPVeV0SKnrVIugf4xmJXkNNtU1l62g5Whkqu9KMk1uzPpopSwyaGk7I0WftPU57J jenkins@pgdgbuild.dus.dg-i.net'
-
   - name: create chroot directory
     file:
       name: /home/chroot

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index a628fe93328aea46b0d8a3fa1d8dc971d4198b73..87a1155a25b78227fa55f1e63466556726f3c50d 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -91,35 +91,43 @@
                     - extension-only
                     - all
 
-    slaves_axis: &slaves_axis
+    all_nodes_axis: &all_nodes_axis
             type: slave
             name: slave
             values:
               - master
-              - arm64-1
-              - ppc64el-1
-              - s390x-1
-              - x86-1
+              - arm64
+              - ppc64el
+              - s390x
+              - x86
+    slaves_axis: &slaves_axis
+            type: slave
+            name: slave
+            values:
+              - arm64
+              - ppc64el
+              - s390x
+              - x86
     x86_slaves_axis: &x86_slaves_axis
             type: slave
             name: slave
             values:
-              - x86-1
+              - x86
     arm64_slaves_axis: &arm64_slaves_axis
             type: slave
             name: slave
             values:
-              - arm64-1
+              - arm64
     ppc64el_slaves_axis: &ppc64el_slaves_axis
             type: slave
             name: slave
             values:
-              - ppc64el-1
+              - ppc64el
     s390x_slaves_axis: &s390x_slaves_axis
             type: slave
             name: slave
             values:
-              - s390x-1
+              - s390x
 
     arch_axis: &arch_axis
             type: slave
@@ -636,7 +644,7 @@
         name: postgresql-server-jobs
         git-url: https://salsa.debian.org/postgresql/postgresql.git
         upstream-url: https://git.postgresql.org/git/postgresql.git
-        reference-repo: '$HOME/gitcache.buexcl/postgresql'
+        reference-repo: '/srv/jenkins/gitcache/postgresql'
         jobs:
                 - 'build-pipeline'
                 - 'source-git'
@@ -678,7 +686,7 @@
         workspace: '$HOME/apt.postgresql.org'
         child-workspace: .
         axes:
-                - axis: *slaves_axis
+                - axis: *all_nodes_axis
         scm: &scm_pgapt
                 - git:
                         url: https://git.postgresql.org/git/pgapt.git
@@ -688,7 +696,7 @@
                         wipe-workspace: false
         builders:
                 - shell: 'chmod go+rX -R .' # make directory readable for other workers
-                - shell: 'make install' # install /etc/schroot/chroot.d/sbuild.conf
+                - shell: 'test -d /home/buildd && make install' # install /etc/schroot/chroot.d/sbuild.conf
         publishers:
                 - trigger:
                         project: apt.postgresql.org-jobs
@@ -916,7 +924,7 @@
 - job:
         name: gitcache-postgresql
         description: Reference repository postgresql source jobs
-        workspace: '$HOME/gitcache.buexcl/postgresql'
+        workspace: '/srv/jenkins/gitcache/postgresql'
         scm:
                 - git:
                         url: https://git.postgresql.org/git/postgresql.git
@@ -950,59 +958,28 @@
                         strategy: any-failure
                         message-type: summary
 
-- job: &ping
-        name: ping-ppc64el
-        description: Check if the ppc64el build host is up
-        workspace: '$JENKINS_HOME'
-        node: master
-        triggers:
-                - timed: "H */4 * * *"
-        builders:
-                - shell: 'ping -c3 10.3.22.22'
-        publishers:
-                - ircbot:
-                        strategy: any-failure
-                        message-type: summary
-
 - job:
-        <<: *ping
         name: jenkins-plugin-updates
         description: Reports pending Jenkins plugin updates
+        node: master
         triggers:
                 - timed: "59 10 * * *"
         builders:
                 - shell: |
-                    : https://pgdgbuild.dus.dg-i.net/pluginManager/
+                    : https://jengus.postgresql.org/pluginManager/
                     # this broke in mid-March 2020, ignore errors for now
-                    curl -f --netrc -X POST --header 'Referer: https://pgdgbuild.dus.dg-i.net/pluginManager/checkUpdatesServer' https://pgdgbuild.dus.dg-i.net/pluginManager/checkUpdatesServer || :
+                    curl -f --netrc -X POST --header 'Referer: https://jengus.postgresql.org/pluginManager/checkUpdatesServer' https://pgdgbuild.dus.dg-i.net/pluginManager/checkUpdatesServer || :
                     ssh -i ~/.ssh/slave -p 2222 jenkins@localhost list-plugins > plugins.txt
                     cat plugins.txt
                     if grep ')$' plugins.txt; then
                       : There are pending Jenkins plugin updates
-                      : https://pgdgbuild.dus.dg-i.net/pluginManager/
+                      : https://jengus.postgresql.org/pluginManager/
                       exit 1
                     fi
-
-- job:
-        <<: *ping
-        name: scm-sync-status
-        description: Reports SCM Sync errors
-        triggers:
-                - timed: "59 10 * * *"
-        builders:
-                - shell: |
-                    ls -l scm-sync-configuration.*
-                    if test -f scm-sync-configuration.fail.log; then
-                      cat scm-sync-configuration.fail.log
-                      test scm-sync-configuration.success.log -nt scm-sync-configuration.fail.log
-                    fi
-
-- job:
-        <<: *ping
-        name: apache2-running
-        description: Check if apache2 is running
-        builders:
-                - shell: 'systemctl status apache2'
+        publishers:
+                - ircbot:
+                        strategy: any-failure
+                        message-type: summary
 
 # project jobs
 
@@ -2415,4 +2392,86 @@
         jobs:
                 - git-packages
 
+# views
+
+- view:
+    name: Auxiliary
+    description: Helper and infrastructure jobs
+    view-type: list
+    job-name:
+      - apt.postgresql.org
+      - apt.postgresql.org-jobs
+      - builddebcheck
+      - debcheck
+      - dput
+      - dput-matrixreloaded
+      - gitcache-postgresql
+      - hardlink-jenkins-files
+      - jenkins-plugin-updates
+      - list-upgradable-packages
+      - sbuild-update-arm64
+      - sbuild-update-ppc64el
+      - sbuild-update-s390x
+      - sbuild-update-x86
+      - stale-schroot-sessions
+      - update-jenkins-plugins
+    columns: &view_columns
+      - status
+      - job
+      - build-button
+      - last-success
+      - last-failure
+      - last-duration
+
+- view:
+    name: Binaries
+    view-type: list
+    regex: '.*binaries'
+    columns: *view_columns
+
+- view:
+    name: Binaries-Beta
+    view-type: list
+    regex: '.*binaries-beta'
+    columns: *view_columns
+
+- view:
+    name: Default
+    view-type: list
+    regex: '.*(?<!-autopkgtest|-binaries|-source|-beta|-snapshot)$'
+    columns: *view_columns
+
+- view:
+    name: PostgreSQL
+    view-type: list
+    regex: 'postgresql-[\d.]*(|-autopkgtest.*|-binaries.*|-source.*)|postgresql-common.*|upgrade-.*'
+    columns: *view_columns
+
+- view:
+    name: Snapshot
+    view-type: list
+    regex: '.*-snapshot'
+    columns: *view_columns
+
+- view:
+    name: Source
+    view-type: list
+    regex: '.*-source.*'
+    columns: *view_columns
+
+- view:
+    name: Testsuite
+    view-type: list
+    job-name:
+      - builddebcheck
+      - debcheck
+    regex: '.*-autopkgtest'
+    columns: *view_columns
+
+- view:
+    name: Testsuite-Beta
+    view-type: list
+    regex: '.*-autopkgtest-beta'
+    columns: *view_columns
+
 ##

diff --git a/jenkins/trigger-binnmu b/jenkins/trigger-binnmu
index 9156fbc20f0fb4cf312a6d0f1a1a80b8811cde5d..c6b48b89c5a3e8b0dfc2261826c6f7253d9152c2 100755 (executable)
--- a/jenkins/trigger-binnmu
+++ b/jenkins/trigger-binnmu
@@ -18,7 +18,7 @@ shift $(($OPTIND - 1))
 PACKAGE="$1"
 
 ./trigger-source-rebuild -r "${revision:-1}" ${distribution:+-d "$distribution"} "$PACKAGE"
-echo "https://pgdgbuild.dus.dg-i.net/job/$PACKAGE-source"
+echo "https://jengus.postgresql.org/job/$PACKAGE-source"
 echo -n "Continue? "
 read reply
 ./trigger-job ${distribution:+-d "$distribution"} ${queue:+-q "$queue"} "$PACKAGE-binaries"

diff --git a/jenkins/trigger-job b/jenkins/trigger-job
index 34864b0923640434c2cb798f29b4e7ee15baa6fb..4fff3a5007090c2dcb205007faeba9896a84edb4 100755 (executable)
--- a/jenkins/trigger-job
+++ b/jenkins/trigger-job
@@ -5,7 +5,7 @@
 # ./trigger-job dput 'binaries=postgresql-12-binaries'
 
 # ~/.netrc:
-#machine pgdgbuild.dus.dg-i.net login <username> password <your-api-token>
+#machine jengus.postgresql.org login <username> password <your-api-token>
 
 set -e
 
@@ -44,9 +44,9 @@ set -- $branch $revision $binnmu_reason $binnmu_version $autopkgtest $DEB_BUILD_
 
 set -x
 curl -f --netrc \
-  "https://pgdgbuild.dus.dg-i.net/job/$JOB/buildWithParameters" \
+  "https://jengus.postgresql.org/job/$JOB/buildWithParameters" \
   --data "$*"
 
 #for JOB in $JOB{,-source,-binaries,-autopkgtest,-autopkgtest-beta,-source-snapshot,-binaries-snapshot}; do
-#curl --netrc -X POST "https://pgdgbuild.dus.dg-i.net/job/$JOB/doDelete"
+#curl --netrc -X POST "https://jengus.postgresql.org/job/$JOB/doDelete"
 #done

diff --git a/jenkins/trigger-source-rebuild b/jenkins/trigger-source-rebuild
index fd9c026e754fb19aa0dd9e101ff419d746a902ea..d7e22efccf9dbfc30633ace4f882a13ac0c90384 100755 (executable)
--- a/jenkins/trigger-source-rebuild
+++ b/jenkins/trigger-source-rebuild
@@ -19,7 +19,7 @@ done
 shift $(($OPTIND - 1))
 
 PACKAGE="$1"
-XML=$(curl -fs https://pgdgbuild.dus.dg-i.net/view/Sources/job/$PACKAGE-source/lastSuccessfulBuild/api/xml?xpath=//lastBuiltRevision/SHA1)
+XML=$(curl -fs https://jengus.postgresql.org/view/Sources/job/$PACKAGE-source/lastSuccessfulBuild/api/xml?xpath=//lastBuiltRevision/SHA1)
 SHA1=$(echo "$XML" | grep -Eo '[0-9a-f]{40}')
 test "$SHA1"