From e65fef06aca93976f08bd61f9b4e6c20626c2dfe Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 17 Jun 2023 09:20:52 +0200 Subject: [PATCH] beaker: make Copr vendor configurable --- .../Sanity/copr-cli-basic-operations/all-in-tmux-redhat.sh | 3 ++- beaker-tests/Sanity/copr-cli-basic-operations/config | 1 + .../copr-cli-basic-operations/runtest-pkg-with-macros.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/all-in-tmux-redhat.sh b/beaker-tests/Sanity/copr-cli-basic-operations/all-in-tmux-redhat.sh index 6072cfbdc..280193dd3 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/all-in-tmux-redhat.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/all-in-tmux-redhat.sh @@ -7,6 +7,7 @@ FRONTEND_HOST=dev-copr.devel.redhat.com FRONTEND_URL=https://$FRONTEND_HOST BACKEND_URL=https://dev-coprbe.devel.redhat.com DISTGIT_URL=https://dev-copr-dist-git.devel.redhat.com +VENDOR="Red Hat Internal Copr (devel) - " set -e @@ -25,5 +26,5 @@ EOF fi -export OWNER FRONTEND_URL BACKEND_URL DISTGIT_URL +export OWNER FRONTEND_URL BACKEND_URL DISTGIT_URL VENDOR exec "$our_dir/all-in-tmux.sh" "$@" diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/config b/beaker-tests/Sanity/copr-cli-basic-operations/config index 6a1ecdc94..809b2cdca 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/config +++ b/beaker-tests/Sanity/copr-cli-basic-operations/config @@ -10,6 +10,7 @@ : "${BACKEND_URL=https://copr-be-dev.cloud.fedoraproject.org}" : "${DISTGIT_URL=https://copr-dist-git-dev.fedorainfracloud.org}" : "${OWNER=@copr}" +: "${VENDOR=Fedora Copr (devel) - group @copr}" # Owner and project NAME_VAR="TEST$(date +%s%N)" # names should be unique diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-pkg-with-macros.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-pkg-with-macros.sh index c33b2661c..a7d1fa870 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-pkg-with-macros.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-pkg-with-macros.sh @@ -37,7 +37,7 @@ rlJournalStart rlRun "parse_build_id" output=`mktemp` get_rpm_builder_log 'pkg-with-macros' > $output - rlRun "cat $output |grep 'COPR VENDOR: Fedora Copr (devel) - group @copr'" + rlRun "cat $output |grep 'COPR VENDOR: $VENDOR'" rlRun "cat $output |grep 'COPR BUILDTAG: .copr${BUILD_ID}'" rlPhaseEnd