Properly publish specs pages to top-level

The content is generated in specs/output and we need to publish it
directly in the specs directory. Move files around so that we can
publish to it since the scp publisher does not allow removal of paths.

Change-Id: Icd8af32b47c04ae207471007435c1dac45471a18

jenkins/jobs/macros.yaml

@@ -398,6 +398,21 @@
           echo "Network neighbors..."
           ip neighbor show
 
+- builder:
+    name: static-publish-prep
+
+    # We want to publish to the docroot but the scp publisher cannot remove
+    # paths, so use a shell builder to move the content in the right place and
+    # publish from there.
+    builders:
+      - shell: |
+          #!/bin/bash -xe
+          rm -rf ,content
+          mv $source ,content
+          rm -rf .[^.]* [^,]*
+          mv ,content/.[^.]* ,content/* ./
+          rm -r ,content
+
 - builder:
     name: install-buck
     builders:

jenkins/jobs/specs-jobs.yaml

@@ -58,13 +58,15 @@
 
     builders:
       - generate-specs-site
+      - static-publish-prep:
+          source: 'specs/output'
 
     publishers:
       - scp:
           site: 'static.openstack.org'
           files:
             - target: 'specs/'
-              source: 'specs/output/**'
+              source: '**'
               keep-hierarchy: true
               copy-after-failure: false
       - console-log

jenkins/jobs/static-publish-jobs.yaml

@@ -4,21 +4,13 @@
     name: static-{name}-publish
     node: 'bare-precise || bare-trusty'
 
-    # We want to publish to the docroot but the scp publisher cannot remove
-    # paths, so use a shell builder to move the content in the right place and
-    # publish from there.
     builders:
       - revoke-sudo
       - gerrit-git-prep
       - docs:
           project: '{name}'
-      - shell: |
+      - static-publish-prep:
-          #!/bin/bash -xe
+          source: 'doc/build/html'
-          rm -rf ,html
-          mv doc/build/html ,html
-          rm -rf .[^.]* [^,]*
-          mv ,html/.[^.]* ,html/* ./
-          rm -r ,html
 
     publishers:
       - scp: