Merge "fuel, armband: Limit dovetail to Danube branch"

diff --git a/jjb/nfvbench/nfvbench.yml b/jjb/nfvbench/nfvbench.yml
index 62776d5..a01e9aa 100644 (file)
--- a/jjb/nfvbench/nfvbench.yml
+++ b/jjb/nfvbench/nfvbench.yml
@@ -90,4 +90,4 @@
 
     builders:
       - shell: |
-          echo "pass"
+          cd $WORKSPACE && tox

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 1ae79e1..15686a2 100644 (file)
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -275,12 +275,6 @@
       - shell:
           !include-raw: ./yardstick-daily.sh
 
-- builder:
-    name: yardstick-vtcdaily
-    builders:
-      - shell:
-          !include-raw: ./yardstick-vtcdaily.sh
-
 - builder:
     name: yardstick-fetch-os-creds
     builders:

diff --git a/jjb/yardstick/yardstick-vtcdaily.sh b/jjb/yardstick/yardstick-vtcdaily.sh
deleted file mode 100755 (executable)
index 737d680..0000000
--- a/jjb/yardstick/yardstick-vtcdaily.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-cd $WORKSPACE
-./tests/ci/apexlake-verify