Fix jenkins-plugin-updates job

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 0e1b8b157642a4e965f76e90030d9650b9069657..ebd17197803e34a984a529b2bec3ff7a4e310ea0 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -968,11 +968,18 @@
         triggers:
                 - timed: "59 10 * * *"
         builders:
+                # this needs an API token in ~jenkins/.netrc:
+                # machine jengus.postgresql.org login admin password xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+                # and an ssh key in ~jenkins/.ssh/jenkins_ssh_cli:
+                # host jenkins
+                #  hostname localhost
+                #  port 5422
+                #  user admin
+                #  IdentityFile ~/.ssh/jenkins_ssh_cli
                 - shell: |
                     : https://jengus.postgresql.org/pluginManager/
-                    # this broke in mid-March 2020, ignore errors for now
-                    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
+                    curl -f --netrc -X POST --header 'Referer: https://jengus.postgresql.org/pluginManager/checkUpdatesServer' https://jengus.postgresql.org/pluginManager/checkUpdatesServer
+                    ssh jenkins list-plugins > plugins.txt
                     cat plugins.txt
                     if grep ')$' plugins.txt; then
                       : There are pending Jenkins plugin updates
@@ -2417,7 +2424,6 @@
       - sbuild-update-s390x
       - sbuild-update-x86
       - stale-schroot-sessions
-      - update-jenkins-plugins
     columns: &view_columns
       - status
       - job