Merge "Publish placement-api-ref"

jenkins/jobs/api-jobs.yaml

@@ -112,7 +112,7 @@
       - console-log
 
 - job-template:
-    name: gate-placement-api-ref-nv
+    name: gate-placement-api-ref
     description: Build and draft the placement API Reference from source.
     node: ubuntu-xenial
 
@@ -168,6 +168,34 @@
       - test-results
       - console-log
 
+# Because placement is hosted within nova, which has its own api-ref,
+# we need a separate job for placement, to handle the separate
+# directories.
+# TODO(cdent): When placement gets its own repo, remove the special
+# jobs, this one and 'gate-placement-api-ref'.
+- job:
+    name: 'placement-api-ref'
+    description: Build and publish the Placement API Reference from source.
+    node: ubuntu-xenial
+
+    builders:
+      - zuul-git-prep-upper-constraints
+      - install-distro-packages
+      - revoke-sudo
+      - run-tox:
+          envlist: 'placement-api-ref'
+      - add-docs-root-marker:
+          docsrootdir: placement-api-ref/build/html
+
+    publishers:
+      - afs:
+          site: afs-developer-docs
+          source: 'placement-api-ref/build/html/**'
+          target: 'api-ref/placement'
+          remove-prefix: 'placement-api-ref/build/html/'
+      - test-results
+      - console-log
+
 # Be aware that the variable "service" needs to be
 # set when this job group is used.
 # The "service" variable comes from the service catalog, which is

jenkins/jobs/projects.yaml

@@ -8539,7 +8539,8 @@
       - api-ref-jobs:
           service: compute
       - gate-{name}-api-ref-src
-      - gate-placement-api-ref-nv
+      - gate-placement-api-ref
+      - placement-api-ref
       - '{pipeline}-tempest-dsvm-neutron-nova-next-full-{node}{suffix}':
           pipeline: gate
           node: ubuntu-xenial

zuul/layout.yaml

@@ -2730,7 +2730,7 @@ jobs:
       - '^api-ref/.*'
       - '^doc/api_samples/.*'
 
-  - name: ^gate-placement-api-ref-nv$
+  - name: ^gate-placement-api-ref$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/placement-api-ref/build/html/
     branch: master
     files:
@@ -12879,14 +12879,16 @@ projects:
       - gate-tempest-dsvm-neutron-nova-next-full-ubuntu-xenial-nv
       - gate-tempest-dsvm-multinode-live-migration-ubuntu-xenial
       - gate-tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa-ubuntu-xenial-nv
-      - gate-placement-api-ref-nv
+      - gate-placement-api-ref
     gate:
       - gate-nova-tox-functional-ubuntu-xenial
       - gate-nova-tox-functional-py35-ubuntu-xenial
       - gate-tempest-dsvm-cells-ubuntu-xenial
       - gate-tempest-dsvm-multinode-live-migration-ubuntu-xenial
+      - gate-placement-api-ref
     post:
       - nova-coverage-ubuntu-xenial
+      - placement-api-ref
     experimental:
       - gate-tempest-dsvm-nova-v20-api-ubuntu-xenial
       - gate-grenade-dsvm-neutron-nova-next-ubuntu-xenial-nv