CSIT: Make script inclusion more readable

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>

26 files changed, 287 insertions, 98 deletions

diff --git a/jjb/csit/csit-func.yaml b/jjb/csit/csit-func.yaml
index 90fc9d327..7827397d9 100644
--- a/jjb/csit/csit-func.yaml
+++ b/jjb/csit/csit-func.yaml
@@ -1,4 +1,4 @@
-# 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.
@@ -87,7 +87,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: include-raw-csit-vpp-functional-virl.sh
+          !include-raw-escape:
+          - ../scripts/csit/vpp-functional-virl.sh
 
     publishers:
       - robot-report:
@@ -143,7 +144,8 @@
 
     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:
@@ -197,7 +199,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
+          !include-raw-escape:
+          - ../scripts/csit/tldk-functional-virl.sh
 
     publishers:
       - robot-report:
@@ -249,7 +252,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: include-raw-csit-dmm-functional-virl.sh
+          !include-raw-escape:
+          - ../scripts/csit/dmm-functional-virl.sh
 
     publishers:
       - robot-report:
diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index ed788fdba..d49122015 100644
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -1,3 +1,16 @@
+# 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
@@ -68,7 +81,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh
+          !include-raw-escape:
+          - ../scripts/csit/hc2vpp-verify-func.sh
 
     publishers:
       - email-notification:
diff --git a/jjb/csit/csit-macros.yaml b/jjb/csit/csit-macros.yaml
index 16e349bc7..037e62568 100644
--- a/jjb/csit/csit-macros.yaml
+++ b/jjb/csit/csit-macros.yaml
@@ -1,3 +1,16 @@
+# 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
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 2383b5e27..d9263a4aa 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,4 +1,4 @@
-# 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.
@@ -192,7 +192,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
@@ -266,7 +267,8 @@
       - 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:
@@ -340,7 +342,8 @@
       - 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:
@@ -409,7 +412,8 @@
       - 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:
@@ -517,7 +521,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
@@ -591,7 +596,8 @@
       - 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:
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index d2af54ce0..e83ce94db 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -1,3 +1,16 @@
+# 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
@@ -59,7 +72,8 @@
 
     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
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index c435f2198..3c713d08e 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# 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:
@@ -146,7 +146,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
@@ -229,7 +230,8 @@
       - 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:
@@ -313,7 +315,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
@@ -392,7 +395,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
@@ -470,7 +474,8 @@
       - 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:
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 440a12984..ad6689c99 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# 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:
@@ -120,7 +120,8 @@
           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:
@@ -195,7 +196,8 @@
           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:
@@ -247,7 +249,8 @@
           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:
diff --git a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
deleted file mode 100644
index 2f22a9842..000000000
--- a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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 :
diff --git a/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
deleted file mode 100644
index 76248890f..000000000
--- a/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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 :
diff --git a/jjb/csit/include-raw-csit-vpp-functional-multilink.sh b/jjb/csit/include-raw-csit-vpp-functional-multilink.sh
deleted file mode 100644
index 065500f23..000000000
--- a/jjb/csit/include-raw-csit-vpp-functional-multilink.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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 :
diff --git a/jjb/csit/include-raw-csit-vpp-functional-virl.sh b/jjb/csit/include-raw-csit-vpp-functional-virl.sh
deleted file mode 100644
index ce7b58e9d..000000000
--- a/jjb/csit/include-raw-csit-vpp-functional-virl.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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 :
diff --git a/jjb/csit/include-raw-csit-cpta.sh b/jjb/scripts/csit/cpta.sh
index def57d565..d6bc187b4 100644
--- a/jjb/csit/include-raw-csit-cpta.sh
+++ b/jjb/scripts/csit/cpta.sh
@@ -1,5 +1,18 @@
 #!/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"
diff --git a/jjb/csit/include-raw-csit-device-semiweekly.sh b/jjb/scripts/csit/device-semiweekly.sh
index b45f7688a..10c3ed7a0 100644
--- a/jjb/csit/include-raw-csit-device-semiweekly.sh
+++ b/jjb/scripts/csit/device-semiweekly.sh
@@ -1,6 +1,6 @@
 #!/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:
diff --git a/jjb/csit/include-raw-csit-device-verify.sh b/jjb/scripts/csit/device-verify.sh
index 312254131..f26e6beba 100644
--- a/jjb/csit/include-raw-csit-device-verify.sh
+++ b/jjb/scripts/csit/device-verify.sh
@@ -1,6 +1,6 @@
 #!/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:
diff --git a/jjb/csit/include-raw-csit-dmm-functional-virl.sh b/jjb/scripts/csit/dmm-functional-virl.sh
index 43fb02572..fcc0a49ad 100644
--- a/jjb/csit/include-raw-csit-dmm-functional-virl.sh
+++ b/jjb/scripts/csit/dmm-functional-virl.sh
@@ -1,5 +1,7 @@
 #!/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:
diff --git a/jjb/csit/include-raw-csit-docs.sh b/jjb/scripts/csit/docs.sh
index d7149118c..ebd8546b8 100644
--- a/jjb/csit/include-raw-csit-docs.sh
+++ b/jjb/scripts/csit/docs.sh
@@ -1,5 +1,18 @@
 #!/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"
diff --git a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh b/jjb/scripts/csit/hc2vpp-verify-func.sh
index 0e3c183fe..3e3c63e07 100644
--- a/jjb/csit/include-raw-csit-hc2vpp-verify-func.sh
+++ b/jjb/scripts/csit/hc2vpp-verify-func.sh
@@ -1,5 +1,18 @@
 #!/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
diff --git a/jjb/scripts/csit/nsh_sfc-functional-virl.sh b/jjb/scripts/csit/nsh_sfc-functional-virl.sh
new file mode 100644
index 000000000..d90003d0c
--- /dev/null
+++ b/jjb/scripts/csit/nsh_sfc-functional-virl.sh
@@ -0,0 +1,34 @@
+#!/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 :
diff --git a/jjb/scripts/csit/nsh_sfc-perf-hw.sh b/jjb/scripts/csit/nsh_sfc-perf-hw.sh
new file mode 100644
index 000000000..6f2eb3bdd
--- /dev/null
+++ b/jjb/scripts/csit/nsh_sfc-perf-hw.sh
@@ -0,0 +1,32 @@
+#!/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 :
diff --git a/jjb/csit/include-raw-csit-perf-timed.sh b/jjb/scripts/csit/perf-timed.sh
index 99605c7e0..1ef068cdc 100644
--- a/jjb/csit/include-raw-csit-perf-timed.sh
+++ b/jjb/scripts/csit/perf-timed.sh
@@ -1,6 +1,6 @@
 #!/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:
diff --git a/jjb/csit/include-raw-csit-perf-verify.sh b/jjb/scripts/csit/perf-verify.sh
index 718b580c5..c68a88126 100644
--- a/jjb/csit/include-raw-csit-perf-verify.sh
+++ b/jjb/scripts/csit/perf-verify.sh
@@ -1,6 +1,6 @@
 #!/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:
diff --git a/jjb/csit/include-raw-csit-report.sh b/jjb/scripts/csit/report.sh
index 20f098a28..b2ea0f966 100644
--- a/jjb/csit/include-raw-csit-report.sh
+++ b/jjb/scripts/csit/report.sh
@@ -1,5 +1,18 @@
 #!/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"
diff --git a/jjb/csit/include-raw-csit-tldk-functional-virl.sh b/jjb/scripts/csit/tldk-functional-virl.sh
index bcaf17bd2..8e732a517 100644
--- a/jjb/csit/include-raw-csit-tldk-functional-virl.sh
+++ b/jjb/scripts/csit/tldk-functional-virl.sh
@@ -1,5 +1,6 @@
 #!/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:
diff --git a/jjb/scripts/csit/tox.sh b/jjb/scripts/csit/tox.sh
new file mode 100644
index 000000000..32ccb5c00
--- /dev/null
+++ b/jjb/scripts/csit/tox.sh
@@ -0,0 +1,22 @@
+#!/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
diff --git a/jjb/scripts/csit/vpp-functional-multilink.sh b/jjb/scripts/csit/vpp-functional-multilink.sh
new file mode 100644
index 000000000..5cf2454eb
--- /dev/null
+++ b/jjb/scripts/csit/vpp-functional-multilink.sh
@@ -0,0 +1,28 @@
+#!/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 :
diff --git a/jjb/scripts/csit/vpp-functional-virl.sh b/jjb/scripts/csit/vpp-functional-virl.sh
new file mode 100644
index 000000000..f2e38e8e1
--- /dev/null
+++ b/jjb/scripts/csit/vpp-functional-virl.sh
@@ -0,0 +1,28 @@
+#!/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 :