From aee4f95592cb8f6fb978e924a6e2a7d4bcb75a4d Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 27 Oct 2015 16:37:49 -0600 Subject: [PATCH] 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. --- ansible/slave.yml | 4 ++++ ansible/slave.yml.j2 | 4 ++++ teuthology-docs/build/build | 2 +- teuthology-docs/config/definitions/teuthology-docs.yml | 6 ++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ansible/slave.yml b/ansible/slave.yml index f23a6970..3883f691 100644 --- 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 4abd2bb9..3b230909 100644 --- 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 2cb7369b..e4d9180b 100644 --- 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 665bfc21..73a5bd0e 100644 --- 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 -- 2.39.5