# Install/cache python packages
make_vpp_test "test-dep" "$branch"
if [ "$OS_ID" = "ubuntu" ] ; then
- # TODO: Remove make test-doc after VPP 21.06 and 21.10 are no longer supported
+ # TODO: Remove make test-doc after VPP 21.06 and 21.10 are no longer supported
# which is deprecated in master (VPP 22.02)
make_vpp_test "doc" "$branch"
make_vpp test-wipe "$branch"
return
fi
git clean -qfdx
- description="'make UNATTENDED=y $target' in $(pwd) ($branch)"
+ description="'make UNATTENDED=yes $target' in $(pwd) ($branch)"
echo_log -e " Starting $description..."
- local force_opts="--allow-downgrades --allow-remove-essential"
- force_opts="$force_opts --allow-change-held-packages"
- make UNATTENDED=y CONFIRM="-y" FORCE="$force_opts" \
- $target 2>&1 | tee -a "$bld_log"
+ make UNATTENDED=yes $target 2>&1 | tee -a "$bld_log"
git checkout -q -- .
echo_log " Completed $description!"
}
# longer supported
vpp_release="$(${WORKSPACE}/build-root/scripts/version rpm-version)"
if [[ "${vpp_release::2}" -ge "22" ]] ; then
- CONFIRM=-y FORCE=--force-yes make docs docs-spell
+ make UNATTENDED=yes docs docs-spell
else
- CONFIRM=-y FORCE=--force-yes make docs-venv docs
+ make UNATTENDED=yes docs-venv docs
fi
--- /dev/null
+#!/bin/bash
+
+# Copyright (c) 2022 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:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo "---> jjb/scripts/vpp/docs_spell.sh"
+
+if grep -qE '^docs\-%' Makefile && grep -qE '^spell' docs/Makefile
+then
+ make docs-spell
+else
+ echo "Can't find docs-spell target in Makefile - skipping docs-spell"
+fi
- compare-type: REG_EXP
pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$
forbidden-file-paths:
- - compare-type: REG_EXP
- pattern: .*docs\/.*
- compare-type: REG_EXP
pattern: .*extras\/emacs\/.*
disable-strict-forbidden-file-verification: 'true'
- shell:
!include-raw-escape:
- ../scripts/vpp/commitmsg.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/docs_spell.sh
publishers:
- fdio-infra-publish