@@ -168,8 +168,17 @@ jobs:
168168 --define "upstream_version ${VERSION}" \
169169 --define "dist .fc${FEDORA_VERSION}"
170170
171- find ~/rpmbuild/RPMS -maxdepth 2 -type f -name "${MAIN_RPM_PATTERN}" -exec cp {} dist/rpm/ \;
172- find ~/rpmbuild/RPMS -maxdepth 2 -type f -name "${COMMON_RPM_PATTERN}" -exec cp {} dist/rpm/ \;
171+ MAIN_RPM_FILE="$(find ~/rpmbuild/RPMS -maxdepth 2 -type f -name "${MAIN_RPM_PATTERN}" | head -n1)"
172+ if [[ -z "${MAIN_RPM_FILE}" ]]; then
173+ echo "Failed to find built ${RPM_ARCH} main RPM." >&2
174+ exit 1
175+ fi
176+ cp "${MAIN_RPM_FILE}" "dist/rpm/ro-control-${RPM_ARCH}.rpm"
177+
178+ COMMON_RPM_FILE="$(find ~/rpmbuild/RPMS -maxdepth 2 -type f -name "${COMMON_RPM_PATTERN}" | head -n1)"
179+ if [[ -n "${COMMON_RPM_FILE}" ]]; then
180+ cp "${COMMON_RPM_FILE}" "dist/rpm/ro-control-common-noarch.rpm"
181+ fi
173182
174183 if [[ "${RPM_ARCH}" == "x86_64" ]]; then
175184 cp ~/rpmbuild/SRPMS/*.src.rpm dist/rpm/
@@ -180,9 +189,8 @@ jobs:
180189 VERSION : ${{ needs.metadata.outputs.version }}
181190 RPM_ARCH : ${{ matrix.arch }}
182191 run : |
183- RPM_PATTERN="*.${RPM_ARCH}.rpm"
184- RPM_FILE="$(find dist/rpm -maxdepth 1 -type f -name "${RPM_PATTERN}" | head -n1)"
185- if [[ -z "${RPM_FILE}" ]]; then
192+ RPM_FILE="dist/rpm/ro-control-${RPM_ARCH}.rpm"
193+ if [[ ! -f "${RPM_FILE}" ]]; then
186194 echo "Failed to locate built ${RPM_ARCH} RPM." >&2
187195 exit 1
188196 fi
@@ -200,15 +208,15 @@ jobs:
200208 env :
201209 RPM_ARCH : ${{ matrix.arch }}
202210 run : |
203- MAIN_RPM_FILE="$(find dist/rpm -maxdepth 1 -type f -name " ro-control-*. ${RPM_ARCH}.rpm" | head -n1) "
204- COMMON_RPM_FILE="$(find dist/rpm -maxdepth 1 -type f -name ' ro-control-common-*. noarch.rpm' | head -n1) "
211+ MAIN_RPM_FILE="dist/rpm/ ro-control-${RPM_ARCH}.rpm"
212+ COMMON_RPM_FILE="dist/rpm/ ro-control-common-noarch.rpm"
205213
206- if [[ -z "${MAIN_RPM_FILE}" ]]; then
214+ if [[ ! -f "${MAIN_RPM_FILE}" ]]; then
207215 echo "Main ro-control RPM is missing." >&2
208216 exit 1
209217 fi
210218
211- if [[ -z "${COMMON_RPM_FILE}" ]]; then
219+ if [[ ! -f "${COMMON_RPM_FILE}" ]]; then
212220 echo "ro-control-common noarch RPM is missing." >&2
213221 exit 1
214222 fi
@@ -229,17 +237,15 @@ jobs:
229237 VERSION : ${{ needs.metadata.outputs.version }}
230238 RPM_ARCH : ${{ matrix.arch }}
231239 run : |
232- RPM_PATTERN="*.${RPM_ARCH}.rpm"
233- NOARCH_PATTERN="*.noarch.rpm"
234- RPM_FILE="$(find dist/rpm -maxdepth 1 -type f -name "${RPM_PATTERN}" | head -n1)"
235- NOARCH_FILE="$(find dist/rpm -maxdepth 1 -type f -name "${NOARCH_PATTERN}" | head -n1)"
240+ RPM_FILE="dist/rpm/ro-control-${RPM_ARCH}.rpm"
241+ NOARCH_FILE="dist/rpm/ro-control-common-noarch.rpm"
236242
237- if [[ -z "${RPM_FILE}" ]]; then
243+ if [[ ! -f "${RPM_FILE}" ]]; then
238244 echo "Failed to locate built ${RPM_ARCH} RPM for smoke testing." >&2
239245 exit 1
240246 fi
241247
242- if [[ -z "${NOARCH_FILE}" ]]; then
248+ if [[ ! -f "${NOARCH_FILE}" ]]; then
243249 echo "Failed to locate ro-control-common noarch RPM for smoke testing." >&2
244250 exit 1
245251 fi
0 commit comments