From 9c14c03d05e1a55ebe2587a2d9b55462c04013a7 Mon Sep 17 00:00:00 2001 From: Jakub Kadlčík Date: Mar 21 2019 10:19:39 +0000 Subject: [beaker-tests-sanity] don't hardcode chroot name in tests A similar change was done in 57942a43 but only for `runtest.sh` --- diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/build-spec.sh b/beaker-tests/Sanity/copr-cli-basic-operations/build-spec.sh index 8663862..2bcf36e 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/build-spec.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/build-spec.sh @@ -39,7 +39,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "copr-cli create ${NAME_PREFIX}BuildSpec --enable-net on --chroot fedora-27-x86_64" 0 + rlRun "copr-cli create ${NAME_PREFIX}BuildSpec --enable-net on --chroot $CHROOT" 0 rlRun "copr-cli build ${NAME_PREFIX}BuildSpec $HERE/files/vera.spec" 0 rlRun "copr-cli delete ${NAME_PREFIX}BuildSpec" rlPhaseEnd diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/bz1457888.sh b/beaker-tests/Sanity/copr-cli-basic-operations/bz1457888.sh index 92da48f..0ff456a 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/bz1457888.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/bz1457888.sh @@ -55,7 +55,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "copr-cli create ${NAME_PREFIX}TestBug1457888 --chroot fedora-27-x86_64" 0 + rlRun "copr-cli create ${NAME_PREFIX}TestBug1457888 --chroot $CHROOT" 0 # The Bug 1457888 specifically concerns the Mock SCM method # but since it was deprecated and even removed from the code, # we are going to use its successor for this test diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh b/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh index 10f0e83..f5c4879 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh @@ -39,14 +39,14 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "copr create ${NAME_PREFIX}BuildScm --enable-net on --chroot fedora-27-x86_64" 0 + rlRun "copr create ${NAME_PREFIX}BuildScm --enable-net on --chroot $CHROOT" 0 rlRun "copr buildscm --clone-url https://src.fedoraproject.org/rpms/rpkg-util.git ${NAME_PREFIX}BuildScm" 0 rlRun "copr buildscm --clone-url https://github.com/clime/example.git --method make_srpm ${NAME_PREFIX}BuildScm" 0 rlRun "copr buildscm --clone-url https://github.com/clime/example.git --method tito ${NAME_PREFIX}BuildScm" 0 rlRun "copr buildscm --clone-url https://github.com/clime/example2.git --subdir subpkg --spec example.spec --method tito_test ${NAME_PREFIX}BuildScm" 0 rlRun "copr buildscm --clone-url https://src.fedoraproject.org/forks/mgahagan/rpms/passwd.git --commit 9ac07e38c9351fb1c4e724e68deaeac6b6b1ab4 ${NAME_PREFIX}BuildScm" 0 - rlRun "copr create ${NAME_PREFIX}PackageScm --enable-net on --chroot fedora-27-x86_64" 0 + rlRun "copr create ${NAME_PREFIX}PackageScm --enable-net on --chroot $CHROOT" 0 rlRun "copr add-package-scm --name example --clone-url https://github.com/clime/example.git --method tito ${NAME_PREFIX}PackageScm" 0 rlRun "copr edit-package-scm --name example --clone-url https://github.com/clime/example.git --method rpkg ${NAME_PREFIX}PackageScm" 0 rlRun "copr build-package --name example ${NAME_PREFIX}PackageScm" 0 diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/upload_authentication.sh b/beaker-tests/Sanity/copr-cli-basic-operations/upload_authentication.sh index 2aec813..82ea572 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/upload_authentication.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/upload_authentication.sh @@ -55,7 +55,7 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlRun "copr-cli create ${NAME_PREFIX}AuthTest --chroot fedora-27-x86_64" 0 + rlRun "copr-cli create ${NAME_PREFIX}AuthTest --chroot $CHROOT" 0 rlRun "copr-cli build ${NAME_PREFIX}AuthTest $HERE/files/auth_test.src.rpm" 0 rlRun "copr-cli --config $HERE/files/copr-config-bad build ${NAME_PREFIX}AuthTest $HERE/files/auth_test.src.rpm" 1 rlRun "copr-cli --config $HERE/files/copr-config-bad build ${NAME_PREFIX}AuthTest $HERE/files/auth_test.src.rpm | grep 'Uploading package'" 1