rename teuthology-docs-build to teuthology-docs. fix encoding in rsync command

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/teuthology-docs-build/build/build b/teuthology-docs-build/build/build
deleted file mode 100644 (file)
index 4f690e0..0000000
--- a/teuthology-docs-build/build/build
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Create the virtualenv
-virtualenv venv
-. venv/bin/activate
-
-# Define and ensure the PIP cache
-PIP_SDIST_INDEX="$HOME/.cache/pip"
-mkdir -p $PIP_SDIST_INDEX
-
-# Install the package by trying with the cache first, otherwise doing a download only, and then
-# trying to install from the cache again.
-if ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox; then
-    venv/bin/pip install --download-directory="$PIP_SDIST_INDEX" tox
-    venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox
-fi
-
-
-# create the docs build with tox
-tox -rv -e docs
-# publish docs to ceph.com/teuthology/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/teuthology/docs/

diff --git a/teuthology-docs-build/config/definitions/teuthology-docs-build.yml b/teuthology-docs-build/config/definitions/teuthology-docs-build.yml
deleted file mode 100644 (file)
index 66f3f41..0000000
--- a/teuthology-docs-build/config/definitions/teuthology-docs-build.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-- job:
-    name: teuthology-docs-build 
-    node: gitbuilder-cdep-deb-cloud-precise-amd64-basic
-    project-type: freestyle
-    defaults: global
-    disabled: false
-    display-name: 'Teuthology: Docs Build'
-    concurrent: false
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - github:
-          url: https://github.com/ceph/teuthology
-    logrotate:
-      daysToKeep: -1 
-      numToKeep: -1 
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    triggers:
-      - pollscm: "* * * * *"
-
-    scm:
-      - git:
-          url: https://github.com/ceph/teuthology.git
-          branches:
-            - master 
-          browser: githubweb
-          browser-url: https://github.com/ceph/teuthology.git
-          timeout: 20
-
-    builders:
-      - shell:
-          !include-raw ../../build/build

diff --git a/teuthology-docs/build/build b/teuthology-docs/build/build
new file mode 100644 (file)
index 0000000..d59b297
--- /dev/null
+++ b/teuthology-docs/build/build
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -ex
+
+# Create the virtualenv
+virtualenv venv
+. venv/bin/activate
+
+# Define and ensure the PIP cache
+PIP_SDIST_INDEX="$HOME/.cache/pip"
+mkdir -p $PIP_SDIST_INDEX
+
+# Install the package by trying with the cache first, otherwise doing a download only, and then
+# trying to install from the cache again.
+if ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox; then
+    venv/bin/pip install --download-directory="$PIP_SDIST_INDEX" tox
+    venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox
+fi
+
+
+# create the docs build with tox
+tox -rv -e docs
+# publish docs to ceph.com/teuthology/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/teuthology/docs/

diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml
new file mode 100644 (file)
index 0000000..a929c40
--- /dev/null
+++ b/teuthology-docs/config/definitions/teuthology-docs.yml
@@ -0,0 +1,36 @@
+- job:
+    name: teuthology-docs 
+    node: gitbuilder-cdep-deb-cloud-precise-amd64-basic
+    project-type: freestyle
+    defaults: global
+    disabled: false
+    display-name: 'Teuthology: Docs Build'
+    concurrent: false
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - github:
+          url: https://github.com/ceph/teuthology
+    logrotate:
+      daysToKeep: -1 
+      numToKeep: -1 
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    triggers:
+      - pollscm: "* * * * *"
+
+    scm:
+      - git:
+          url: https://github.com/ceph/teuthology.git
+          branches:
+            - master 
+          browser: githubweb
+          browser-url: https://github.com/ceph/teuthology.git
+          timeout: 20
+
+    builders:
+      - shell:
+          !include-raw ../../build/build