Publish build files correctly on merge

This patch fixes 2 things:
1/ The publish job didn't work, as it missed the double *
2/ Only publish after merge (ie: a post: job) and not on
every patch iteration

Change-Id: I6465056ff737b1fc5606f4f92a2a4e8acd89250d

jenkins/jobs/deb-openstack-pkg-tools.yaml

@@ -24,4 +24,31 @@
 
     publishers:
       - console-log
+
+- job:
+    name: pkgdeb-publish-openstack-pkg-tools
+    node: debian-jessie
+
+    wrappers:
+      - build-timeout:
+          timeout: 30
+      - timestamps
+
+    builders:
+    - gerrit-git-prep
+    - shell: |
+          #!/bin/bash
+
+          set -x
+          set -e
+
+          sudo cp ${WORKSPACE}/build-tools/pkgos-infra-install-sbuild /usr/sbin
+          sudo chmod +x /usr/sbin/pkgos-infra-install-sbuild
+          sudo cp ${WORKSPACE}/build-tools/pkgos-infra-build-pkg /usr/bin
+          sudo chmod +x /usr/bin/pkgos-infra-build-pkg
+          sudo pkgos-infra-install-sbuild
+          pkgos-infra-build-pkg
+
+    publishers:
+      - console-log
       - deb-pkgs

jenkins/jobs/macros.yaml

@@ -872,7 +872,7 @@
           site: 'tarballs.openstack.org'
           files:
             - target: 'tarballs/{project}/'
-              source: 'uploads/*'
+              source: 'uploads/**'
               keep-hierarchy: true
 
 - publisher:

zuul/layout.yaml

@@ -5389,6 +5389,8 @@ projects:
       - pkgdeb-build-openstack-pkg-tools
     gate:
       - pkgdeb-build-openstack-pkg-tools
+    post:
+      - pkgdeb-publish-openstack-pkg-tools
 
   - name: openstack/debtcollector
     template: