summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/scripts/vpp/docs.sh4
-rwxr-xr-xjjb/scripts/vpp/docs_spell.sh23
-rw-r--r--jjb/vpp/vpp.yaml5
3 files changed, 28 insertions, 4 deletions
diff --git a/jjb/scripts/vpp/docs.sh b/jjb/scripts/vpp/docs.sh
index a3c9f477f..2d80e5593 100755
--- a/jjb/scripts/vpp/docs.sh
+++ b/jjb/scripts/vpp/docs.sh
@@ -30,7 +30,7 @@ fi
# 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
diff --git a/jjb/scripts/vpp/docs_spell.sh b/jjb/scripts/vpp/docs_spell.sh
new file mode 100755
index 000000000..4b6a97851
--- /dev/null
+++ b/jjb/scripts/vpp/docs_spell.sh
@@ -0,0 +1,23 @@
+#!/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
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 1e336c9c6..5a157285c 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -402,8 +402,6 @@
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'
override-votes: true
@@ -436,6 +434,9 @@
- shell:
!include-raw-escape:
- ../scripts/vpp/commitmsg.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/docs_spell.sh
publishers:
- fdio-infra-publish