Merge "fixes for docs-build.sh migration"

diff --combined jjb/releng-macros.yaml
index 631a33f,34f12ab..7733aba
--- 1/jjb/releng-macros.yaml
--- 2/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@@ -61,11 -61,6 +61,11 @@@
      triggers:
          - timed: ''
  
 +- trigger:
 +    name: 'weekly-trigger-disabled'
 +    triggers:
 +        - timed: ''
 +
  - trigger:
      name: 'brahmaputra-trigger-daily-enabled'
      triggers:
@@@ -178,8 -173,8 +178,8 @@@
              set -o errexit
              set -o xtrace
              export PATH=$PATH:/usr/local/bin/
-             git clone ssh://gerrit.opnfv.org:29418/releng
-             GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
+             git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs
+             GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh
  
  - builder:
      name: upload-under-review-docs-to-opnfv-artifacts
@@@ -352,11 -347,8 +352,11 @@@
                  -type f -name "*.py" -print | \
                  xargs flake8 --exit-zero -qq --count 2>&1)"
  
 +            # Ensure we start with a clean environment
 +            rm -f lint.log
 +
              if [ ! -z $FLAKE_COUNT ]; then
 -              echo "Flake8 Violations: $FLAKE_COUNT" >> lint.log
 +              echo "Flake8 Violations: $FLAKE_COUNT" > lint.log
                find . \
                    -path './releng_flake8' -prune -o \
                    -type f -name "*.py" -print | \
@@@ -366,6 -358,8 +366,6 @@@
                cat violation.log >> lint.log
                sed -r -i '4,$s/^/ /g' lint.log
                rm violation.log
 -            else
 -              echo -e "Flake8 Violations: 0" > lint.log
              fi
  
              deactivate
@@@ -379,21 -373,15 +379,21 @@@
              set -o pipefail
              set -o xtrace
              export PATH=$PATH:/usr/local/bin/
 +
 +            # If no violations were found, no lint log will exist.
              if [[ -e lint.log ]] ; then
                  echo -e "\nposting linting report to gerrit...\n"
 +
                  cat lint.log
                  echo
 +
                  ssh -p 29418 gerrit.opnfv.org \
                      "gerrit review -p $GERRIT_PROJECT \
                       -m \"$(cat lint.log)\" \
                       $GERRIT_PATCHSET_REVISION \
                       --notify NONE"
 +
 +                exit 1
              fi
  
  - builder:

diff --combined jjb/yardstick/yardstick-project-jobs.yml
index 5973fce,fae6cad..7656c92
--- 1/jjb/yardstick/yardstick-project-jobs.yml
--- 2/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@@ -31,7 -31,7 +31,7 @@@
              project: '{project}'
          - gerrit-parameter:
              branch: '{branch}'
 -        - 'ericsson-build-defaults'
 +        - 'opnfv-build-ubuntu-defaults'
  
      scm:
          - gerrit-trigger-scm:
@@@ -70,7 -70,7 +70,7 @@@
              project: '{project}'
          - gerrit-parameter:
              branch: '{branch}'
 -        - 'ericsson-build-defaults'
 +        - 'opnfv-build-ubuntu-defaults'
          - string:
              name: GS_URL
              default: '$GS_BASE{gs-pathname}'
@@@ -133,7 -133,7 +133,7 @@@
              sphinx-apidoc -o docs/apidocs yardstick
  
              # build docs
-             git clone ssh://gerrit.opnfv.org:29418/releng
-             GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
+             git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs
+             GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh
  
              deactivate