Merge "Removes separate Object Storage Admin manual as the content is now in other books."

modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml

@@ -337,37 +337,6 @@
           remove-prefix: 'doc/src/docbkx/openstack-network-connectivity-admin/target/docbkx/webhelp/'
           excludes: '**/*.xml,**/null*'
 
-- job:
-    name: openstack-admin-manual-object
-    project-type: maven
-    concurrent: false
-    node: precise
-
-    prebuilders:
-      - gerrit-git-prep
-
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/docbook-properties.sh
-          properties-file: gerrit-doc.properties
-
-    maven:
-      maven-name: Maven3
-      root-module:
-        group-id: org.openstack.docs
-        artifact-id: openstack-guide
-      root-pom: doc/src/docbkx/openstack-object-storage-admin/pom.xml
-      goals: '-Drelease.path.name=${DOC_RELEASE_PATH} -Dcomments.enabled=${DOC_COMMENTS_ENABLED} clean generate-sources'
-
-    publishers:
-      - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'doc/src/docbkx/openstack-object-storage-admin/target/docbkx/webhelp/**'
-          target: '/'
-          remove-prefix: 'doc/src/docbkx/openstack-object-storage-admin/target/docbkx/webhelp/'
-          excludes: '**/*.xml,**/null*'
-
 # in zuul/layout.yaml specified to only run against master branch.
 - job:
     name: openstack-docs-site

modules/openstack_project/files/zuul/layout.yaml

@@ -1851,7 +1851,6 @@ projects:
     post:
       - openstack-admin-manual-compute
       - openstack-admin-manual-netconn
-      - openstack-admin-manual-object
       - openstack-admin-manual-block
       - openstack-user-guide
       - openstack-basic-install-fedora