Adjust TEST_TAGs for timed jobs

+ remove obsolete bootstraps

Change-Id: Iee1fe404106f2fa0c438ff30526e756f037ce676
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
deleted file mode 100755 (executable)
index f6cdb22..0000000
--- a/bootstrap-verify-perf-DPDK.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2018 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.
-
-# run the script
-./bootstrap-verify-perf.sh $@

diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh
deleted file mode 100644 (file)
index f6cdb22..0000000
--- a/bootstrap-verify-perf-ligato.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2018 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.
-
-# run the script
-./bootstrap-verify-perf.sh $@

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index 8134a0c..c72d6ec 100755 (executable)
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -335,14 +335,10 @@ EXCLUDE_NICS=($(comm -13 <(printf '%s\n' "${TOPOLOGY_NICS[@]}") <(printf '%s\n'
 case "$TEST_CODE" in
     # Select specific performance tests based on jenkins job type variable.
     *ndrpdr-weekly* )
-        TEST_TAG_ARRAY=(ndrpdrANDnic_intel-x520-da2AND1c
-                        ndrpdrANDnic_intel-x520-da2AND2c
-                        ndrpdrAND1cANDipsec
-                        ndrpdrAND2cANDipsec)
+        TEST_TAG_ARRAY=(ndrpdrAND64bAND1c
+                        ndrpdrAND78bAND1c)
         ;;
-    *ndrpdr-timed* )
-        ;;
-    *mrr-daily* )
+    *mrr-daily* | *mrr-weekly* )
         TEST_TAG_ARRAY=(mrrAND64bAND1c
                         mrrAND64bAND2c
                         mrrAND64bAND4c