From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 27 Oct 2015 21:22:19 +0000 (-0600)
Subject: ceph-deploy-docs: rsync to new newdocs.ceph.com
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3acf386335e92913d6d63bda244c9d496c8441ca;p=ceph-build.git

ceph-deploy-docs: rsync to new newdocs.ceph.com

TODO: Replace "newdocs.ceph.com" with "docs.ceph.com" in the rsync
command. This can be done once we change the "docs.ceph.com" A record in
DNS to point to the the newdocs.ceph.com web server.
---

diff --git a/ceph-deploy-docs/build/build b/ceph-deploy-docs/build/build
index ca30c9500..b585747a7 100644
--- a/ceph-deploy-docs/build/build
+++ b/ceph-deploy-docs/build/build
@@ -20,5 +20,6 @@ fi
 
 # create the docs build with tox
 tox -rv -e docs
-# publish docs to ceph.com/ceph-deploy/docs
-rsync -auv --delete -e "ssh -i /home/jenkins-build/.ssh/cephdocs_id_rsa -o StrictHostKeyChecking=no" .tox/docs/tmp/html/* cephdocs@ceph.newdream.net:/home/ceph_site/ceph.com/ceph-deploy/docs/
+
+# publish docs to docs.ceph.com/docs/ceph-deploy
+rsync -auv --delete .tox/docs/tmp/html/* jenkins-publish@newdocs.ceph.com:/var/ceph-deploy/docs/
diff --git a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
index 06b49729f..eae428637 100644
--- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
+++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
@@ -32,6 +32,12 @@
           skip-tag: true
           timeout: 20
 
+    wrappers:
+      - ssh-agent-credentials:
+          users:
+            # "jenkins-publish" SSH key, needed for rsync to docs.ceph.com:
+            - 'fa9ca012-6731-4c7d-be74-eda748e36ee8'
+
     builders:
       - shell:
           !include-raw ../../build/build