From 4a82461c53e8d2bc9571cd6705a88a726bcf62e8 Mon Sep 17 00:00:00 2001
From: Fangyin Hu <fangyinx.hu@intel.com>
Date: Fri, 14 Jul 2017 03:56:00 -0700
Subject: 	Add the TLDK functional test Jenkis job into CSIT. 	Add
 the license header.

Change-Id: I3cd01d3a17025b597fd4ad5863231e2c4597fcf9
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>
---
 jjb/tldk/include-raw-csit-tldk-functional-virl.sh | 39 -----------------
 jjb/tldk/include-raw-tldk-csit-functional-virl.sh | 52 +++++++++++++++++++++++
 jjb/tldk/tldk.yaml                                | 20 +++++++--
 3 files changed, 69 insertions(+), 42 deletions(-)
 delete mode 100644 jjb/tldk/include-raw-csit-tldk-functional-virl.sh
 create mode 100644 jjb/tldk/include-raw-tldk-csit-functional-virl.sh

(limited to 'jjb/tldk')

diff --git a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh b/jjb/tldk/include-raw-csit-tldk-functional-virl.sh
deleted file mode 100644
index de52e3097..000000000
--- a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-set -xeu -o pipefail
-
-# Clone tldk and start tests
-git clone https://gerrit.fd.io/r/tldk
-
-# If the git clone fails, complain clearly and exit
-if [ $? != 0 ]; then
-    echo "Failed to run: git clone https://gerrit.fd.io/r/tldk"
-    exit 1
-fi
-
-# Clone csit and start tests
-git clone https://gerrit.fd.io/r/csit
-
-# If the git clone fails, complain clearly and exit
-if [ $? != 0 ]; then
-    echo "Failed to run: git clone https://gerrit.fd.io/r/csit"
-    exit 1
-fi
-
-# Move the tldk to the csit dir
-sudo mv -f ./tldk/ ./csit/
-
-cd csit
-
-# execute nsh_sfc bootstrap script if it exists
-if [ -e bootstrap-TLDK.sh ]
-then
-    # make sure that bootstrap-TLDK.sh is executable
-    chmod +x bootstrap-TLDK.sh
-    # run the script
-    ./bootstrap-TLDK.sh
-else
-    echo 'ERROR: No bootstrap-TLDK.sh found'
-    exit 1
-fi
-
-# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/tldk/include-raw-tldk-csit-functional-virl.sh b/jjb/tldk/include-raw-tldk-csit-functional-virl.sh
new file mode 100644
index 000000000..547a000f7
--- /dev/null
+++ b/jjb/tldk/include-raw-tldk-csit-functional-virl.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Copyright (c) 2017 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
+
+# Clone tldk and start tests
+git clone https://gerrit.fd.io/r/tldk
+
+# If the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+    echo "Failed to run: git clone https://gerrit.fd.io/r/tldk"
+    exit 1
+fi
+
+# Clone csit and start tests
+git clone https://gerrit.fd.io/r/csit
+
+# If the git clone fails, complain clearly and exit
+if [ $? != 0 ]; then
+    echo "Failed to run: git clone https://gerrit.fd.io/r/csit"
+    exit 1
+fi
+
+# Move the tldk to the csit dir
+sudo mv -f ./tldk/ ./csit/
+
+cd csit
+
+# execute nsh_sfc bootstrap script if it exists
+if [ -e bootstrap-TLDK.sh ]
+then
+    # make sure that bootstrap-TLDK.sh is executable
+    chmod +x bootstrap-TLDK.sh
+    # run the script
+    ./bootstrap-TLDK.sh
+else
+    echo 'ERROR: No bootstrap-TLDK.sh found'
+    exit 1
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 57e64f83e..41e1b5469 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -1,10 +1,24 @@
+# Copyright (c) 2017 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: tldk
     jobs:
         - '{project}-verify-{stream}-{os}'
         - '{project}-merge-{stream}-{os}'
         - '{project}-verify-image-{stream}-{os}'
-        - 'csit-tldk-verify-func-{stream}-{os}-virl'
+        - 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project: 'tldk'
     os:
@@ -170,7 +184,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-tldk-verify-func-{stream}-{os}-virl'
+    name: 'tldk-csit-verify-func-{stream}-{os}-virl'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
@@ -206,7 +220,7 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
+            !include-raw-escape: include-raw-tldk-csit-functional-virl.sh
 
     publishers:
         - archive-artifacts:
-- 
cgit 1.2.3-korg