Skip to content

Commit 98ad465

Browse files
committed
testing-farm: cleaner logging format in package installer
1 parent 6bf7ec4 commit 98ad465

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

mock/integration-tests/setup-playbook/files/install-copr-packages

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ DNF=/usr/bin/dnf-3
1313
REPOQUERY=( "$DNF" repoquery )
1414
DOWNLOAD=( "$DNF" download )
1515

16+
info() { echo >&2 "INFO: $*" ; }
17+
error() { echo >&2 "ERROR: $*" ; false; }
18+
die() { echo >&2 "FATAL: $*" ; exit 1 ; }
19+
1620
copr_dir=$1 ; shift
1721
commit=$1 ; shift
1822
copr_uri=https://download.copr.fedorainfracloud.org/results
@@ -33,9 +37,9 @@ copr_chroot() (
3337

3438
repo=$copr_uri/$copr_dir/$(copr_chroot)
3539

36-
echo >&2 "using repo: $repo"
40+
repoid=pull-request-proposed-packages
3741

38-
repoid=xyztest
42+
info "using [$repoid] repo: $repo"
3943

4044
export clean_cache=true
4145

@@ -52,10 +56,6 @@ _repoquery() {
5256
"${cmd[@]}" 2>/dev/null
5357
}
5458

55-
info() { echo >&2 "INFO: $*" ; }
56-
error() { echo >&2 "ERROR: $*" ; false; }
57-
die() { echo >&2 "FATAL: $*" ; exit 1 ; }
58-
5959
find_nvr() {
6060
# ARGS: $1=pkg $2=commit
6161
# RETURN: $find_nvr_result
@@ -96,7 +96,7 @@ done
9696

9797
if test -n "$SRPM_DOWNLOAD_DIR"; then
9898
mkdir -p "$SRPM_DOWNLOAD_DIR"
99-
cmd=( "${DOWNLOAD[@]}" "${repos[@]}" '--disablerepo=*' --enablerepo xyztest
99+
cmd=( "${DOWNLOAD[@]}" "${repos[@]}" '--disablerepo=*' --enablerepo "$repoid"
100100
"${nvrs[@]}" --source --downloaddir "$SRPM_DOWNLOAD_DIR" )
101101
else
102102
cmd=( "$DNF" -y install "${nvrs[@]}" "${repos[@]}" --nogpgcheck )

0 commit comments

Comments
 (0)