X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fgather.sh;h=e0829400b00dc4669fd3c4f8e403ccf016f42e2a;hb=91ff7a3f99ecb6e1e849bb9ee0b58b22d0be0b5a;hp=0bef2923a05a8ce61e1a3453e420b8ddb77cf21e;hpb=1ae2fdf1c6bb14fc3db34cba00271916a1d7c527;p=csit.git diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh index 0bef2923a0..e0829400b0 100644 --- a/resources/libraries/bash/function/gather.sh +++ b/resources/libraries/bash/function/gather.sh @@ -123,7 +123,7 @@ function gather_vpp () { # Files read: # - ${CSIT_DIR}/DPDK_STABLE_VER - DPDK version to use # by csit-vpp not-timed jobs. - # - ${CSIT_DIR}/VPP_STABLE_VER_UBUNTU - Ubuntu VPP version to usee. + # - ${CSIT_DIR}/${VPP_VER_FILE} - Ubuntu VPP version to use. # - ../*vpp*.deb|rpm - Relative to ${DOWNLOAD_DIR}, copied for vpp-csit jobs. # Directories updated: # - ${DOWNLOAD_DIR}, vpp-*.deb files are copied here for vpp-csit jobs. @@ -141,9 +141,10 @@ function gather_vpp () { "csit-"*) # Use downloaded packages with specific version. if [[ "${TEST_CODE}" == *"daily"* ]] || \ - ([[ "${TEST_CODE}" == *"weekly"* ]] && \ - [[ "${TEST_CODE}" != *"device"* ]]) || \ - [[ "${TEST_CODE}" == *"semiweekly"* ]]; + { [[ "${TEST_CODE}" == *"weekly"* ]] && \ + [[ "${TEST_CODE}" != *"device"* ]]; } || \ + [[ "${TEST_CODE}" == *"semiweekly"* ]] || \ + [[ "${TEST_CODE}" == *"hourly"* ]]; then warn "Downloading latest VPP packages from Packagecloud." else