From 3ead402fb624ac250aa48728b4c5ff0506633189 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 24 Aug 2018 12:36:06 +0000 Subject: [PATCH] Adjust TEST_TAGs for timed jobs + remove obsolete bootstraps Change-Id: Iee1fe404106f2fa0c438ff30526e756f037ce676 Signed-off-by: Peter Mikus --- bootstrap-verify-perf-DPDK.sh | 16 ---------------- bootstrap-verify-perf-ligato.sh | 16 ---------------- bootstrap-verify-perf.sh | 10 +++------- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100755 bootstrap-verify-perf-DPDK.sh delete mode 100644 bootstrap-verify-perf-ligato.sh diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh deleted file mode 100755 index f6cdb227d2..0000000000 --- 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 index f6cdb227d2..0000000000 --- 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 8134a0c405..c72d6ec7dd 100755 --- 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 -- 2.16.6