teuthology-docs: rsync to 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/ansible/slave.yml b/ansible/slave.yml
index f23a69705991ad4ed823a0103fedec9c8bb3ac96..3883f691cd7a21f8c733dd5c67ae7a6b6f25e594 100644 (file)
--- a/ansible/slave.yml
+++ b/ansible/slave.yml
@@ -64,6 +64,10 @@
         - doxygen
         - ditaa
         - ant
+        # teuthology-docs job:
+        - libmysqlclient-dev
+        - libevent-dev
+        - libffi-dev
       when: ansible_pkg_mgr  == "apt"
 
     - name: install python-jenkins

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 4abd2bb9a5e8c6645b6a3365de740e9b48508cf9..3b230909b79f1a01c2690a5a88c4edfc81bd03be 100644 (file)
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -93,6 +93,10 @@
         - doxygen
         - ditaa
         - ant
+        # teuthology-docs job:
+        - libmysqlclient-dev
+        - libevent-dev
+        - libffi-dev
       when: ansible_pkg_mgr  == "apt"
 
     - name: install six, latest one

diff --git a/teuthology-docs/build/build b/teuthology-docs/build/build
index 2cb7369b9f39ed5b39134e9aa72375d582bb8f07..e4d9180b61f6c2456bf27b5f60bc4eafb734ee59 100644 (file)
--- a/teuthology-docs/build/build
+++ b/teuthology-docs/build/build
@@ -21,4 +21,4 @@ fi
 # create the docs build with tox
 tox -rv -e docs
 # publish docs to docs.ceph.com/docs/teuthology
-rsync -auv --delete .tox/docs/tmp/html/* ubuntu@docs.front.sepia.ceph.com:/var/teuthology/docs/
+rsync -auv --delete .tox/docs/tmp/html/* jenkins-publish@newdocs.ceph.com:/var/teuthology/docs/

diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml
index 665bfc213ef66fb58316a96aeb92625c0d550cbc..73a5bd0e7f3ea4b674e09921452143e6e556e25f 100644 (file)
--- a/teuthology-docs/config/definitions/teuthology-docs.yml
+++ b/teuthology-docs/config/definitions/teuthology-docs.yml
@@ -31,6 +31,12 @@
           browser-url: https://github.com/ceph/teuthology.git
           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