From d6ea9d003edafae641f5b910806fb63afe9db238 Mon Sep 17 00:00:00 2001 From: Webb Scales Date: Wed, 30 Aug 2023 18:13:15 -0400 Subject: [PATCH] Correct regex used to extract version for tags --- agent/containers/images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/containers/images/Makefile b/agent/containers/images/Makefile index d7b8ee0f19..622ac87e9c 100644 --- a/agent/containers/images/Makefile +++ b/agent/containers/images/Makefile @@ -363,7 +363,7 @@ ifdef CI if [[ -z "${_RPM_PATH}" ]] ; then echo "No RPM found with ID ${_LOCAL_GIT_HASH} for ${_LOCAL_MAJORMINOR} in ${CI_RPM_LOC}" >&2 ; exit 2 ; fi if grep ' ' <<< ${_RPM_PATH} ; then echo "Multiple RPMs found: ${_RPM_PATH}" >&2 ; exit 2 ; fi printf -- "%s\n" ${_LOCAL_GIT_HASH} > ${@} - printf -- "v%s\n" "$(shell grep -Eo '[0-9]+\.[0-9]+\.([0-9]+(-[0-9]+)?)?' <<< "${_RPM_PATH}")" >> ${@} + printf -- "v%s\n" "$(shell grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+(-[0-9]+)?)?' <<< "${_RPM_PATH}")" >> ${@} printf -- "v%s-latest v%s-latest\n" ${_LOCAL_MAJOR_VER} ${_LOCAL_MAJORMINOR} >> ${@} else ./gen-tags-from-rpm "${URL_PREFIX}" "$(subst centos,epel,$*)" "${_ARCH}" "${_PBENCH_REPO_NAME}" > ${@}