Historically, scripts names started with include-raw-csit- prefix.
That was not only long and superfluous, but also confusing,
as the actual way of including uses
"include-raw-escape", which is a command behaving differently
than "include-raw", suggested by the previous name.
This Change shortens script names to the part
that actually says something about the script.
+ Move scripts to jjb/scripts/csit/.
- "Absolute" paths are not used, as ci-man root is not in serarch path.
+ Put each path on a separate line to avoid long lines.
+ Update copyright years, add missing copyright notices.
Change-Id: Ifcfad5833577d78bf9105f494d5bf6187abc2a68
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Copyright (c) 2019 PANTHEON.tech s.r.o. 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.
builders:
- shell:
- !include-raw-escape: include-raw-csit-vpp-functional-virl.sh
+ !include-raw-escape:
+ - ../scripts/csit/vpp-functional-virl.sh
publishers:
- robot-report:
builders:
- shell:
- !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
+ !include-raw-escape:
+ - ../scripts/csit/nsh_sfc-functional-virl.sh
publishers:
- robot-report:
builders:
- shell:
- !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
+ !include-raw-escape:
+ - ../scripts/csit/tldk-functional-virl.sh
publishers:
- robot-report:
builders:
- shell:
- !include-raw-escape: include-raw-csit-dmm-functional-virl.sh
+ !include-raw-escape:
+ - ../scripts/csit/dmm-functional-virl.sh
publishers:
- robot-report:
+# Copyright (c) 2020 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.
+
---
- project:
name: csit-hc2vpp
builders:
- shell:
- !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh
+ !include-raw-escape:
+ - ../scripts/csit/hc2vpp-verify-func.sh
publishers:
- email-notification:
+# Copyright (c) 2020 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.
+
---
- trigger:
name: gerrit-trigger-csit-vpp-devicetest-full
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Copyright (c) 2019 PANTHEON.tech s.r.o. 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.
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-verify.sh
publishers:
- robot:
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-verify.sh
publishers:
- robot:
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+ !include-raw-escape:
+ - ../scripts/csit/perf-timed.sh
publishers:
- robot:
+# Copyright (c) 2020 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.
+
---
- project:
name: csit-validate
builders:
- shell:
- ./resources/libraries/bash/entry/tox.sh
+ !include-raw-escape:
+ - ../scripts/csit/tox.sh
publishers:
# TODO: Remove this when a voting pylint difference checker
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/device-verify.sh
publishers:
- robot:
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
+ !include-raw-escape:
+ - ../scripts/csit/device-semiweekly.sh
publishers:
- robot:
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/device-verify.sh
publishers:
- robot:
builders:
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+ !include-raw-escape:
+ - ../scripts/csit/device-verify.sh
publishers:
- robot:
- inject:
properties-file: variables.prop
- shell:
- !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
+ !include-raw-escape:
+ - ../scripts/csit/device-semiweekly.sh
publishers:
- robot:
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
settings-file: 'csit-settings'
global-settings-file: 'global-settings'
- shell:
- !include-raw-escape: include-raw-csit-docs.sh
+ !include-raw-escape:
+ - ../scripts/csit/docs.sh
publishers:
- fdio-infra-shiplogs:
settings-file: 'csit-settings'
global-settings-file: 'global-settings'
- shell:
- !include-raw-escape: include-raw-csit-report.sh
+ !include-raw-escape:
+ - ../scripts/csit/report.sh
publishers:
- fdio-infra-shiplogs:
settings-file: 'csit-settings'
global-settings-file: 'global-settings'
- shell:
- !include-raw-escape: include-raw-csit-cpta.sh
+ !include-raw-escape:
+ - ../scripts/csit/cpta.sh
publishers:
- email-ext:
+++ /dev/null
-#!/bin/bash
-set -xeu -o pipefail
-
-# execute nsh_sfc bootstrap script if it exists
-if [ -e bootstrap-nsh_sfc-functional-virl.sh ]
-then
- # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable
- chmod +x bootstrap-nsh_sfc-functional-virl.sh
- # run the script
- if [ ${STREAM} == 'master' ]; then
- ./bootstrap-nsh_sfc-functional-virl.sh ${STREAM} ${OS}
- else
- ./bootstrap-nsh_sfc-functional-virl.sh 'stable.'${STREAM} ${OS}
- fi
-else
- echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found'
- exit 1
-fi
-
-# vim: ts=4 ts=4 sts=4 et :
+++ /dev/null
-#!/bin/bash
-
-# execute nsh_sfc bootstrap script if it exists
-if [ ! -e bootstrap-verify-perf-nsh_sfc.sh ]
-then
- echo 'ERROR: No bootstrap-verify-perf-nsh_sfc.sh found'
- exit 1
-fi
-
-# make sure that bootstrap-verify-perf.sh is executable
-chmod +x bootstrap-verify-perf-nsh_sfc.sh
-# run the script
-if [ ${STREAM} == 'master' ]; then
- ./bootstrap-verify-perf-nsh_sfc.sh ${STREAM} ${OS}
-else
- ./bootstrap-verify-perf-nsh_sfc.sh 'stable.'${STREAM} ${OS}
-fi
-
-# vim: ts=4 ts=4 sts=4 et :
+++ /dev/null
-#!/bin/bash
-
-# execute csit bootstrap script if it exists
-if [ -e bootstrap-multilink.sh ]
-then
- # make sure that bootstrap.sh is executable
- chmod +x bootstrap-multilink.sh
- # run the script
- ./bootstrap-multilink.sh
-else
- echo 'ERROR: No bootstrap-multilink.sh found'
- exit 1
-fi
-
-# vim: ts=4 ts=4 sts=4 et :
+++ /dev/null
-#!/bin/bash
-
-# execute csit bootstrap script if it exists
-if [ -e bootstrap.sh ]
-then
- # make sure that bootstrap.sh is executable
- chmod +x bootstrap.sh
- # run the script
- ./bootstrap.sh
-else
- echo 'ERROR: No bootstrap.sh found'
- exit 1
-fi
-
-# vim: ts=4 ts=4 sts=4 et :
#!/bin/bash
+# Copyright (c) 2020 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.
+
set -xe -o pipefail
[ "${DOCS_REPO_URL}" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
#!/usr/bin/env bash
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
#!/usr/bin/env bash
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
#!/bin/bash
+
# Copyright (c) 2018 Huawei Technologies Co.,Ltd.
+# Copyright (c) 2020 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:
#!/bin/bash
+# Copyright (c) 2020 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.
+
set -xe -o pipefail
[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
#!/bin/bash
+# Copyright (c) 2020 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.
+
# Parse optional arguments from gerrit comment trigger
for i in ${GERRIT_EVENT_COMMENT_TEXT}; do
case ${i} in
--- /dev/null
+#!/bin/bash
+
+# Copyright (c) 2020 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.
+
+set -xeu -o pipefail
+
+# execute nsh_sfc bootstrap script if it exists
+if [ -e bootstrap-nsh_sfc-functional-virl.sh ]
+then
+ # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable
+ chmod +x bootstrap-nsh_sfc-functional-virl.sh
+ # run the script
+ if [ ${STREAM} == 'master' ]; then
+ ./bootstrap-nsh_sfc-functional-virl.sh ${STREAM} ${OS}
+ else
+ ./bootstrap-nsh_sfc-functional-virl.sh 'stable.'${STREAM} ${OS}
+ fi
+else
+ echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
--- /dev/null
+#!/bin/bash
+
+# Copyright (c) 2020 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.
+
+# execute nsh_sfc bootstrap script if it exists
+if [ ! -e bootstrap-verify-perf-nsh_sfc.sh ]
+then
+ echo 'ERROR: No bootstrap-verify-perf-nsh_sfc.sh found'
+ exit 1
+fi
+
+# make sure that bootstrap-verify-perf.sh is executable
+chmod +x bootstrap-verify-perf-nsh_sfc.sh
+# run the script
+if [ ${STREAM} == 'master' ]; then
+ ./bootstrap-verify-perf-nsh_sfc.sh ${STREAM} ${OS}
+else
+ ./bootstrap-verify-perf-nsh_sfc.sh 'stable.'${STREAM} ${OS}
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
#!/usr/bin/env bash
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
#!/usr/bin/env bash
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
#!/bin/bash
+# Copyright (c) 2020 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.
+
set -xe -o pipefail
[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
#!/bin/bash
-# Copyright (c) 2017 Cisco and/or its affiliates.
+
+# Copyright (c) 2020 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:
--- /dev/null
+#!/usr/bin/env bash
+
+# Copyright (c) 2020 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.
+
+# Currently this is just a direct call to CSIT checked-out script.
+# We do not use source command, to make sure
+# the called script choses the interpreter it needs.
+
+set -exuo pipefail
+
+${WORKSPACE}/resources/libraries/bash/entry/tox.sh
--- /dev/null
+#!/bin/bash
+
+# Copyright (c) 2020 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.
+
+# execute csit bootstrap script if it exists
+if [ -e bootstrap-multilink.sh ]
+then
+ # make sure that bootstrap.sh is executable
+ chmod +x bootstrap-multilink.sh
+ # run the script
+ ./bootstrap-multilink.sh
+else
+ echo 'ERROR: No bootstrap-multilink.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
--- /dev/null
+#!/bin/bash
+
+# Copyright (c) 2020 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.
+
+# execute csit bootstrap script if it exists
+if [ -e bootstrap.sh ]
+then
+ # make sure that bootstrap.sh is executable
+ chmod +x bootstrap.sh
+ # run the script
+ ./bootstrap.sh
+else
+ echo 'ERROR: No bootstrap.sh found'
+ exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
Code Review / ci-management.git / commitdiff