use docs.ceph.com slave for docs jobs

No need to rsync over SSH, or even use ssh-agent with the
jenkins-publish credentials. We can just rsync the job's output directly
into the proper location in /var.

Update the "node" setting to make the job run on the node labeled
"docs".

diff --git a/ceph-deploy-docs/build/build b/ceph-deploy-docs/build/build
index b585747a729479e24fd2f10801171753209a2859..643cb377a071816b3a54b4bd35053b96c9d30422 100644 (file)
--- a/ceph-deploy-docs/build/build
+++ b/ceph-deploy-docs/build/build
@@ -21,5 +21,5 @@ fi
 # create the docs build with tox
 tox -rv -e 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/
+# publish docs to http://docs.ceph.com/docs/ceph-deploy
+rsync -auv --delete .tox/docs/tmp/html/* /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 8ff638e215e8f63569ef6761f0927dedcebe5664..941804e2cbde6a598f8c3224a787e580f1bdb965 100644 (file)
--- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
+++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
@@ -1,6 +1,6 @@
 - job:
     name: ceph-deploy-docs
-    node: trusty
+    node: docs
     project-type: freestyle
     defaults: global
     disabled: false
@@ -32,12 +32,6 @@
           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

diff --git a/ceph-docs/build/build b/ceph-docs/build/build
index a740d4af4726499f24630791f4d0302fdd795519..888b128022c1f7a39a04da0eb83e7d34ff3374df 100644 (file)
--- a/ceph-docs/build/build
+++ b/ceph-docs/build/build
@@ -19,6 +19,6 @@ mkdir -p docs.raw/ref/
 ln -s ../sha1/$REV "docs.raw/ref/$BRANCH"
 
 # Publish this sha1's contents first:
-rsync -a -v docs.raw/sha1/$REV jenkins-publish@newdocs.ceph.com:/var/docs.raw/sha1/
+rsync -a -v docs.raw/sha1/$REV /var/docs.raw/sha1/
 # Now point the ref symlink at the newly-uploaded sha1.
-rsync -a -v docs.raw/ref/$BRANCH jenkins-publish@newdocs.ceph.com:/var/docs.raw/ref/
+rsync -a -v docs.raw/ref/$BRANCH /var/docs.raw/ref/

diff --git a/ceph-docs/config/definitions/ceph-docs.yml b/ceph-docs/config/definitions/ceph-docs.yml
index f26a514a15a6cfa0c91bd25f67838b1cc9b01100..55af7924327c03727067482e1b9f6d1a4f17f38a 100644 (file)
--- a/ceph-docs/config/definitions/ceph-docs.yml
+++ b/ceph-docs/config/definitions/ceph-docs.yml
@@ -1,6 +1,6 @@
 - job:
     name: ceph-docs
-    node: trusty
+    node: docs
     project-type: freestyle
     defaults: global
     concurrent: false
@@ -32,12 +32,6 @@
           timeout: 20
           wipe-workspace: true
 
-    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

diff --git a/teuthology-docs/build/build b/teuthology-docs/build/build
index e4d9180b61f6c2456bf27b5f60bc4eafb734ee59..0d91c8055670bd8e7577a303c2c9bc2b7d905f6a 100644 (file)
--- a/teuthology-docs/build/build
+++ b/teuthology-docs/build/build
@@ -20,5 +20,5 @@ 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/* jenkins-publish@newdocs.ceph.com:/var/teuthology/docs/
+# publish docs to http://docs.ceph.com/docs/teuthology
+rsync -auv --delete .tox/docs/tmp/html/* /var/teuthology/docs/

diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml
index b3fa52a4bb320b28be2ab19ba1b29fa324020554..6ab1dc76c394191c481e19bc2ef54596f6fad64d 100644 (file)
--- a/teuthology-docs/config/definitions/teuthology-docs.yml
+++ b/teuthology-docs/config/definitions/teuthology-docs.yml
@@ -1,6 +1,6 @@
 - job:
     name: teuthology-docs
-    node: trusty
+    node: docs
     project-type: freestyle
     defaults: global
     disabled: false
@@ -31,12 +31,6 @@
           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