From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Wed, 11 Mar 2020 17:17:28 +0000 (-0400)
Subject: fix vpp-sphinx-docs-verify-master job failure
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=4baaa26455c15e247a20956b7732f6301ae098fb;p=ci-management.git

fix vpp-sphinx-docs-verify-master job failure

Job is failing because it is asking to install newer packages.

Apparently the 'make docs' is called from docs and expects
different environment variables set in the base makefile's 'make docs'.

Fixes: b81e5c92687238d60331dd11e9b079657b2aa5bc

Change-Id: I7613cde1178e5e27fdb3e457b4e03969080236c9
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/jjb/scripts/vpp/sphinx-docs.sh b/jjb/scripts/vpp/sphinx-docs.sh
index db2b6bcda..749728731 100644
--- a/jjb/scripts/vpp/sphinx-docs.sh
+++ b/jjb/scripts/vpp/sphinx-docs.sh
@@ -10,7 +10,7 @@ set -xe -o pipefail
 [ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version)
 
 make docs-venv
-UNATTENDED=y make docs
+CONFIRM=-y FORCE=--force-yes make docs
 
 if [[ ${JOB_NAME} == *merge* ]]; then
   mkdir -p $(dirname ${RESOURCES_DIR})