From 9967ca6ec1dadbaf5b5ed4f0fb963210fbaabe0f Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Mon, 21 Nov 2016 11:59:33 +0100
Subject: Update csit-honeycomb-functional job to hc2vpp

Change-Id: I8061ac1d21a0683f490c46265a1196adc33bb36f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 jjb/csit/csit-vpp-honeycomb.yaml                       | 12 ++++++------
 jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh    | 15 +++++++++++++++
 jjb/csit/include-raw-csit-honeycomb-functional-virl.sh | 15 ---------------
 3 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh
 delete mode 100644 jjb/csit/include-raw-csit-honeycomb-functional-virl.sh

(limited to 'jjb')

diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml
index 5aeee0cfb..715d2ddc3 100644
--- a/jjb/csit/csit-vpp-honeycomb.yaml
+++ b/jjb/csit/csit-vpp-honeycomb.yaml
@@ -1,8 +1,8 @@
 - project:
-    name: csit-honeycomb
-    description: 'CSIT jenkins jobs to test Honeycomb features.'
+    name: csit-hc2vpp
+    description: 'CSIT jenkins jobs to test Hc2vpp features.'
     jobs:
-        - 'csit-honeycomb-functional-{stream}-{os}'
+        - 'csit-hc2vpp-functional-{stream}-{os}'
     project: 'csit'
     branch: 'master'
     branch-id: 'master'
@@ -18,7 +18,7 @@
         - ubuntu1404
 
 - job-template:
-    name: 'csit-honeycomb-functional-{stream}-{os}'
+    name: 'csit-hc2vpp-functional-{stream}-{os}'
 
     project-type: freestyle
     node: verify
@@ -49,7 +49,7 @@
 
     triggers:
         - reverse:
-            jobs: 'honeycomb-integration-{stream}-{os}'
+            jobs: 'hc2vpp-integration-{stream}-{os}'
             result: 'success'
 
     prebuilders:
@@ -58,7 +58,7 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-csit-honeycomb-functional-virl.sh
+            !include-raw-escape: include-raw-csit-hc2vpp-functional-virl.sh
 
     postbuilders:
         - shell: |
diff --git a/jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh b/jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh
new file mode 100644
index 000000000..8c2fa9765
--- /dev/null
+++ b/jjb/csit/include-raw-csit-hc2vpp-functional-virl.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# execute csit bootstrap script if it exists
+if [ ! -e bootstrap-vpp-honeycomb.sh ]
+then
+    echo 'ERROR: No bootstrap-vpp-honeycomb.sh found'
+    exit 1
+else
+    # make sure that bootstrap.sh is executable
+    chmod +x bootstrap-vpp-honeycomb.sh
+    # run the script
+    ./bootstrap-vpp-honeycomb.sh
+fi
+
+# vim: ts=4 ts=4 sts=4 et :
diff --git a/jjb/csit/include-raw-csit-honeycomb-functional-virl.sh b/jjb/csit/include-raw-csit-honeycomb-functional-virl.sh
deleted file mode 100644
index 8c2fa9765..000000000
--- a/jjb/csit/include-raw-csit-honeycomb-functional-virl.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# execute csit bootstrap script if it exists
-if [ ! -e bootstrap-vpp-honeycomb.sh ]
-then
-    echo 'ERROR: No bootstrap-vpp-honeycomb.sh found'
-    exit 1
-else
-    # make sure that bootstrap.sh is executable
-    chmod +x bootstrap-vpp-honeycomb.sh
-    # run the script
-    ./bootstrap-vpp-honeycomb.sh
-fi
-
-# vim: ts=4 ts=4 sts=4 et :
-- 
cgit 1.2.3-korg