New doc site updates

Change the workflow to the new model.

Change-Id: Ie26250d47240e7113372df4b1e6e9e8d235d7864
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/daily-jjb-doc-update/include-doc-update.sh b/jjb/daily-jjb-doc-update/include-doc-update.sh
index 0aec673..485d500 100644 (file)
--- a/jjb/daily-jjb-doc-update/include-doc-update.sh
+++ b/jjb/daily-jjb-doc-update/include-doc-update.sh
@@ -11,9 +11,9 @@ git config --global user.name build.automotivelinux.org
 git config --global user.email jenkins@automotivelinux.org
 
 rm -rf docs-webtemplate || true
-wget https://raw.githubusercontent.com/automotive-grade-linux/docs-webtemplate/master-next/setupdocs.sh
+wget https://raw.githubusercontent.com/automotive-grade-linux/docs-webtemplate/master/setupdocs.sh
 mkdir docs-webtemplate
-bash -x setupdocs.sh --directory=docs-webtemplate --webtemplate-ref=master-next --doctools-ref=master-next --baseurl=/next
+bash -x setupdocs.sh --directory=docs-webtemplate --webtemplate-ref=master --doctools-ref=master --baseurl=/
 # Todo --baseurl=/upload/ci/20018
 cd docs-webtemplate
 make build
\ No newline at end of file

diff --git a/jjb/daily-jjb-doc-update/include-doc-upload.sh b/jjb/daily-jjb-doc-update/include-doc-upload.sh
index 731a122..f0cbd92 100644 (file)
--- a/jjb/daily-jjb-doc-update/include-doc-upload.sh
+++ b/jjb/daily-jjb-doc-update/include-doc-upload.sh
@@ -13,8 +13,8 @@ ssh-keyscan -H github.com >> ~/.ssh/known_hosts
 
 mkdir -p $TMPDIR
 git clone -b gh-pages git@github.com:automotive-grade-linux/docs-gh-pages.git $TMPDIR/upload-gh-pages
-mkdir -p $TMPDIR/upload-gh-pages/next/
-cp -ar $HTDOCS/* $TMPDIR/upload-gh-pages/next/
+mkdir -p $TMPDIR/upload-gh-pages/
+cp -ar $HTDOCS/* $TMPDIR/upload-gh-pages/
 pushd $TMPDIR/upload-gh-pages
     git config user.name build.automotivelinux.org
     git config user.email jenkins@automotivelinux.org