Run make lists from apt.postgresql.org

diff --git a/jenkins/Makefile b/jenkins/Makefile
index 3cf38adc9b053e51a8f9118a92eae7ed475be798..065754b83d7a642af50fc67f385cd8960dd5d19a 100644 (file)
--- a/jenkins/Makefile
+++ b/jenkins/Makefile
@@ -1,6 +1,8 @@
 JOBS = pgapt-jobs.yaml
 JJB = jenkins-job-builder
 
+all: test lists
+
 # we write to output.tmp first so output.{old,new} are left untouched in case
 # JJB aborts
 test:
@@ -20,10 +22,10 @@ update-pgdgbuild:
        @echo "*** Updating Jenkins from $(JOBS) ***"
        $(JJB) --conf jenkins_jobs.ini update $(JOBS)
 
-clean:
-       rm -rf output output.old
-
 # package lists
 lists: packages.backports
 packages.backports: pgapt-jobs.yaml
        perl -le 'use YAML::Syck; $$y = LoadFile("pgapt-jobs.yaml"); foreach $$p (@$$y) { print $$p->{project}->{name} if $$p->{project}->{backports} }' > $@
+
+clean:
+       rm -rf output output.old packages.backports

diff --git a/jenkins/debcheck-pgapt b/jenkins/debcheck-pgapt
index 7cf57f91ceab54ffd092df4d39fa09f79616327c..3f3abe0ca40c85aea694f72280d33bad892a9088 100755 (executable)
--- a/jenkins/debcheck-pgapt
+++ b/jenkins/debcheck-pgapt
@@ -3,7 +3,9 @@
 set -eu
 
 LISTSDIR="/home/chroot/$distribution-$architecture/var/lib/apt/lists"
-DISTSDIR="/home/jenkins/dists"
+HOMEDIR="/home/jenkins"
+DISTSDIR="$HOMEDIR/dists"
+PGAPTDIR="$HOMEDIR/apt.postgresql.org/jenkins"
 
 case $stage in
        production) DIST="$distribution-pgdg" ;;
@@ -36,14 +38,14 @@ DEBCHECK="dose-debcheck -v -f -e ${EXTRABG:-} --bg $LISTSDIR/*_dists_${distribut
 # packages not depending on backports
 MAINPKG=$(mktemp main_binary-${architecture}_Packages.XXXXXX)
 cat $DISTSDIR/$DIST/main/binary-${architecture}/Packages > $MAINPKG
-for pkg in $(cat packages.backports); do
+for pkg in $(cat $PGAPTDIR/packages.backports); do
   grep-dctrl --not -S $pkg $MAINPKG > $MAINPKG.tmp
   mv $MAINPKG.tmp $MAINPKG
 done
 
 # packages depending on backports
 BPOPKG=$(mktemp bpo_binary-${architecture}_Packages.XXXXXX)
-for pkg in $(cat packages.backports); do
+for pkg in $(cat $PGAPTDIR/packages.backports); do
   grep-dctrl -S $pkg $DISTSDIR/$DIST/main/binary-${architecture}/Packages >> $BPOPKG
 done
 

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 81641dc8760d21aa3deed929c001f2490cc05c77..ffd2be500a581c74be2ff9c0d57332ad395ba480 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -462,7 +462,7 @@
                                 - master
                         wipe-workspace: false
         builders:
-                - shell: 'cd jenkins && make test && make update'
+                - shell: 'cd jenkins && make && make update'
         publishers:
                 - ircbot:
                         matrix-notifier: all
@@ -500,9 +500,7 @@
                                 - testing
 
         builders:
-                - shell: |
-                    make lists
-                    debcheck-pgapt
+                - shell: debcheck-pgapt
         #publishers:
         #        - ircbot: *only_configs