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 ca30c95002a826975d9f5231d24e8c65986f7395..b585747a729479e24fd2f10801171753209a2859 100644 (file)
--- 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 06b49729f86810d77ccd60428485f6de392dac42..eae4286374b1b6c4700e789a61f638e763305e51 100644 (file)
--- 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