[ODL-pipe]Use of the daily suite from Functest

Change-Id: I658f8992f52d7ab5278299c70285cd53d305a0c6
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

diff --git a/jjb/3rd_party_ci/functest-netvirt.sh b/jjb/3rd_party_ci/functest-netvirt.sh
deleted file mode 100755 (executable)
index adffaf4..0000000
--- a/jjb/3rd_party_ci/functest-netvirt.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-
-# wipe the WORKSPACE
-/bin/rm -rf $WORKSPACE/*
-
-echo "Hello World"

diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index ca19361..054761e 100644 (file)
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -20,8 +20,6 @@
             slave-label: 'ericsson-virtual5'
         - 'install-netvirt':
             slave-label: 'odl-netvirt-virtual'
-        - 'functest':
-            slave-label: 'odl-netvirt-virtual'
         - 'postprocess':
             slave-label: 'odl-netvirt-virtual'
 #####################################
@@ -119,9 +117,8 @@
             name: functest
             condition: SUCCESSFUL
             projects:
-                - name: 'functest-netvirt-virtual-suite-{stream}'
+                - name: 'functest-netvirt-virtual-daily-{stream}'
                   predefined-parameters: |
-                    FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn
                     RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc
                     DEPLOY_SCENARIO=os-odl_l2-bgpvpn-noha
                   node-parameters: true
@@ -162,7 +159,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'odl-netvirt-verify-virtual-install-.*'
-                - 'odl-netvirt-verify-virtual-functest-.*'
+                - 'functest-netvirt-virtual-daily-.*'
                 - 'odl-netvirt-verify-virtual-postprocess-.*'
             block-level: 'NODE'
 
@@ -199,11 +196,6 @@
             !include-raw: ./download-netvirt-artifact.sh
         - shell:
             !include-raw: ./install-netvirt.sh
-- builder:
-    name: 'netvirt-verify-functest-builder'
-    builders:
-        - shell:
-            !include-raw: ./functest-netvirt.sh
 - builder:
     name: 'netvirt-verify-postprocess-builder'
     builders: