Revert "Update docs build for non-multiversion"
This reverts commit 550960bbaa490246e68f529daa5ddb341ccf4b22.
This commit was done after changes were made to voltha-docs builds.
However, at this time the builds are fixed in their original format,
so the change is not longer needed.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: If495b6ed3d0e9c66f1c403f0979db9963f069388
diff --git a/jjb/repos/voltha-docs.yaml b/jjb/repos/voltha-docs.yaml
index ead8a6f..0a85375 100644
--- a/jjb/repos/voltha-docs.yaml
+++ b/jjb/repos/voltha-docs.yaml
@@ -28,8 +28,8 @@
- 'version-tag'
- 'sync-dir':
dependency-jobs: 'version-tag_voltha-docs'
- build-command: 'make docs'
- build-output-path: '_build/'
+ build-command: 'make multiversion'
+ build-output-path: '_build/multiversion/'
sync-target-server: 'static.opennetworking.org'
sync-target-path: '/srv/sites/docs.voltha.org/'
build-timeout: 60
diff --git a/jjb/shell/sync-dir.sh b/jjb/shell/sync-dir.sh
index 07f4d72..1623834 100644
--- a/jjb/shell/sync-dir.sh
+++ b/jjb/shell/sync-dir.sh
@@ -25,8 +25,4 @@
$BUILD_COMMAND
# sync the files to the target
-rsync -rvzh --delete-after --exclude=.git "$WORKSPACE/$BUILD_OUTPUT_PATH/$GERRIT_BRANCH" \
- "$SYNC_TARGET_SERVER:$SYNC_TARGET_PATH/$GERRIT_BRANCH"
-# Parent dir index.html will only be created on master build.
-rsync -vzh "$WORKSPACE/$BUILD_OUTPUT/index.html" \
- "$SYNC_TARGET_SERVER:$SYNC_TARGET_PATH/index.html" || true
+rsync -rvzh --delete-after --exclude=.git "$WORKSPACE/$BUILD_OUTPUT_PATH" "$SYNC_TARGET_SERVER:$SYNC_TARGET_PATH"