diff options
| -rw-r--r-- | resources/libraries/bash/function/gather.sh | 6 | ||||
| -rw-r--r-- | resources/libraries/python/DUTSetup.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh index 429a2cc91f..0bef2923a0 100644 --- a/resources/libraries/bash/function/gather.sh +++ b/resources/libraries/bash/function/gather.sh @@ -124,10 +124,10 @@ function gather_vpp () { # - ${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. - # - ../vpp*.deb|rpm - Relative to ${DOWNLOAD_DIR}, copied for vpp-csit jobs. + # - ../*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. - # - ./ - Assumed ${DOWNLOAD_DIR}, vpp-*.deb|rpm files + # - ./ - Assumed ${DOWNLOAD_DIR}, *vpp*.deb|rpm files # are downloaded here for csit-vpp. # Functions called: # - die - Print to stderr and exit, defined in common_functions.sh @@ -157,7 +157,7 @@ function gather_vpp () { ;; "vpp-csit-"*) # Use locally built packages. - mv "${DOWNLOAD_DIR}"/../"vpp"*".${PKG_SUFFIX}" "${DOWNLOAD_DIR}"/ || { + mv "${DOWNLOAD_DIR}"/../*vpp*."${PKG_SUFFIX}" "${DOWNLOAD_DIR}"/ || { die "Move command failed." } ;; diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 1cca974893..3544997e55 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -661,7 +661,7 @@ class DUTSetup: node, f"rpm -ivh {vpp_pkg_dir}*.rpm", timeout=120, sudo=True, message=message ) - exec_cmd_no_error(node, u"rpm -qai *vpp*", sudo=True) + exec_cmd_no_error(node, u"rpm -qai '*vpp*'", sudo=True) DUTSetup.restart_service(node, Constants.VPP_UNIT) @staticmethod |