diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-01-25 21:41:14 -0500 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2021-01-26 21:12:31 -0500 |
| commit | d75b6bb8373eb649eb694113f73a9207cce3602f (patch) | |
| tree | 7c2a8f22d2f63358eb4371f01b77ece19ec4dd95 /jjb/scripts/vpp/sphinx-docs.sh | |
| parent | 28a7f17ca28d87fa8c4b21b5a51f96c206e6cada (diff) | |
Skip VPP build for merge jobs with Gerrit ID != git HEAD.
- Since merge jobs are serialized after the patches have
been merged into git, all merge jobs which do not have
the same Gerrit ID as git HEAD are redundant. Skip
them to save useless cycles and to reduce the size of
the build queues when multiple patches are merged in a
short amount of time.
- This also fixes the issue with packagecloud packages
containing different contents then the associated
Gerrit ID when built & pushed in this state.
Change-Id: I822492bd1d523576373bb268258c181a9c5edb42
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/scripts/vpp/sphinx-docs.sh')
| -rw-r--r-- | jjb/scripts/vpp/sphinx-docs.sh | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/jjb/scripts/vpp/sphinx-docs.sh b/jjb/scripts/vpp/sphinx-docs.sh index b9eb64bc7..d80b4cd38 100644 --- a/jjb/scripts/vpp/sphinx-docs.sh +++ b/jjb/scripts/vpp/sphinx-docs.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -15,15 +15,25 @@ echo "---> jjb/scripts/vpp/sphinx-docs.sh" -set -xe -o pipefail -[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" -[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/vpp -[ "$DOC_FILE" ] || DOC_FILE=vpp.docs.zip -[ "$DOC_DIR" ] || DOC_DIR=./docs/_build/html -[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site -[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources -[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" -[ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version) +set -euxo pipefail + +line="*************************************************************************" +# Don't build anything if this is a merge job being run when +# the git HEAD id is not the same as the Gerrit New Revision id. +if [[ ${JOB_NAME} == *merge* ]] && [ -n "${GERRIT_NEWREV:-}" ] && + [ "$GERRIT_NEWREV" != "$GIT_COMMIT" ] ; then + echo -e "\n$line\nSkipping sphinx docs build. A newer patch has been merged.\n$line\n" + exit 0 +fi + +DOCS_REPO_URL=${DOCS_REPO_URL:-"https://nexus.fd.io/content/sites/site"} +PROJECT_PATH=${PROJECT_PATH:-"io/fd/vpp"} +DOC_FILE=${DOC_FILE:-"vpp.docs.zip"} +DOC_DIR=${DOC_DIR:-"./docs/_build/html"} +SITE_DIR=${SITE_DIR:-"build-root/docs/deploy-site"} +RESOURCES_DIR=${RESOURCES_DIR:-"${SITE_DIR}/src/site/resources"} +MVN=${MVN:-"/opt/apache/maven/bin/mvn"} +VERSION=${VERSION:-"$(./build-root/scripts/version rpm-version)"} make docs-venv CONFIRM=-y FORCE=--force-yes make docs |