From 4a50d176c2c1e598325e2aefe3249539a852aecb Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 24 Jul 2012 14:21:32 -0700 Subject: [PATCH] Make run-docs.sh handle stable branch changes. Previously run-docs.sh uploaded everything but tagged releases to the root of the developer/project document dir. If changes were uploaded to master then stable/foo the latest docs would get overwritten by the stable/foo docs. This change will put master docs in developer/project and stable foo docs in developer/project/foo fixing this issue. Change-Id: Ia6d33c5b1654fd6b937154a425a3ea6cdc1d7f27 --- modules/jenkins_slave/files/slave_scripts/run-docs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/jenkins_slave/files/slave_scripts/run-docs.sh b/modules/jenkins_slave/files/slave_scripts/run-docs.sh index 134490c6f6..d8ca3cf9e1 100755 --- a/modules/jenkins_slave/files/slave_scripts/run-docs.sh +++ b/modules/jenkins_slave/files/slave_scripts/run-docs.sh @@ -21,6 +21,14 @@ if `echo $GERRIT_REFNAME | grep refs/tags/ >/dev/null` ; then mv doc/build/html/* doc/build/$TAG mv doc/build/$TAG doc/build/html/$TAG fi +elif `echo $GERRIT_REFNAME | grep stable/ >/dev/null` ; then + BRANCH=`echo $GERRIT_REFNAME | sed 's/stable.//'` + if [ ! -z $BRANCH ] ; then + # Move the docs into a subdir if this is a stable branch build + mkdir doc/build/$BRANCH + mv doc/build/html/* doc/build/$BRANCH + mv doc/build/$BRANCH doc/build/html/$BRANCH + fi fi echo "Begin pip freeze output from test virtualenv:"