From 21f2869c8f8ac7b2b21130eb16231a8df2904f5c Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 19 Sep 2017 13:59:34 -0400 Subject: [PATCH 1/1] Docs needs to be built from the $WORKSPACE Otherwise it will build from the submodule because of the if-statement above. This breaks the job in cases where a project has submodules. Change-Id: I06d6291d3329da142ecdbebfb4ac1a866108ef0b Signed-off-by: Thanh Ha --- .jjb-test/expected-xml/gerrit-rtd-rtd-verify-master | 1 + .jjb-test/expected-xml/github-rtd-rtd-verify-master | 1 + shell/rtd-verify.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master index e102182a..5e71f5d1 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master @@ -239,6 +239,7 @@ fi git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD echo "---> Generating docs" +cd "$WORKSPACE" tox -edocs echo "---> Archiving generated docs" diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index a9c3edb0..44dc1b71 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master @@ -191,6 +191,7 @@ fi git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD echo "---> Generating docs" +cd "$WORKSPACE" tox -edocs echo "---> Archiving generated docs" diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh index ff063587..2074ecaf 100644 --- a/shell/rtd-verify.sh +++ b/shell/rtd-verify.sh @@ -22,6 +22,7 @@ fi git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD echo "---> Generating docs" +cd "$WORKSPACE" tox -edocs echo "---> Archiving generated docs" -- 2.16.6