From 1cdbb3bb06039913ac7753f1473249bfd783bb4f Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Jun 25 2019 11:55:28 +0000 Subject: beaker-tests: move example.git under copr/ group In the mean time, that git is fixed for f30. --- diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/helpers b/beaker-tests/Sanity/copr-cli-basic-operations/helpers index 66fbb9c..3a8fd33 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/helpers +++ b/beaker-tests/Sanity/copr-cli-basic-operations/helpers @@ -2,6 +2,7 @@ HELLO=https://pagure.io/copr/copr-test-sources/raw/master/f/hello-2.8-1.src.rpm EVIL_HELLO=https://pagure.io/copr/copr-test-sources/raw/master/f/evilhello-2.8-2.src.rpm +COPR_HELLO_GIT=https://pagure.io/copr/copr-hello.git parse_build_id() { diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/pagure67.sh b/beaker-tests/Sanity/copr-cli-basic-operations/pagure67.sh index b57ce3d..a383375 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/pagure67.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/pagure67.sh @@ -32,7 +32,7 @@ # Load config settings HERE=$(dirname "$(realpath "$0")") source "$HERE/config" - +srouce "$HERE/helpers" rlJournalStart rlPhaseStartSetup @@ -60,11 +60,11 @@ rlJournalStart # The issue #67 specifically concerns the *-package-tito commands, # but since they were deprecated and even removed from the code, # we are going to use its successor for this test - rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestBugPagure67 --name test_package_tito --clone-url http://github.com/clime/example.git --method tito_test --webhook-rebuild on --commit foo --subdir bar" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestBugPagure67 --name test_package_tito --clone-url $COPR_HELLO_GIT --method tito_test --webhook-rebuild on --commit foo --subdir bar" OUTPUT=`mktemp` rlRun "copr-cli get-package ${NAME_PREFIX}TestBugPagure67 --name test_package_tito > $OUTPUT" rlAssertEquals "" `cat $OUTPUT | jq '.auto_rebuild'` "true" - rlRun "copr-cli edit-package-scm ${NAME_PREFIX}TestBugPagure67 --name test_package_tito --clone-url http://github.com/clime/example.git --method tito_test --commit foo --subdir bar" + rlRun "copr-cli edit-package-scm ${NAME_PREFIX}TestBugPagure67 --name test_package_tito --clone-url $COPR_HELLO_GIT --method tito_test --commit foo --subdir bar" rlRun "copr-cli get-package ${NAME_PREFIX}TestBugPagure67 --name test_package_tito > $OUTPUT" rlAssertEquals "" `cat $OUTPUT | jq '.auto_rebuild'` "true" rlRun "copr-cli delete ${NAME_PREFIX}TestBugPagure67" diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-fork.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-fork.sh index 177f3b6..7a0cbff 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-fork.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-fork.sh @@ -32,6 +32,7 @@ # Load config settings HERE=$(dirname "$(realpath "$0")") source "$HERE/config" +source "$HERE/helpers" rlJournalStart @@ -41,7 +42,7 @@ rlJournalStart rlPhaseStartTest OUTPUT=`mktemp` rlRun "copr-cli create --chroot $CHROOT ${NAME_PREFIX}Project10" - rlRun "copr-cli buildscm ${NAME_PREFIX}Project10 --clone-url http://github.com/clime/example.git" + rlRun "copr-cli buildscm ${NAME_PREFIX}Project10 --clone-url $COPR_HELLO_GIT" rlRun "copr-cli fork ${NAME_PREFIX}Project10 ${NAME_PREFIX}Project10Fork > $OUTPUT" rlAssertEquals "Forking project" `grep -r 'Forking project' $OUTPUT |wc -l` 1 rlAssertEquals "Info about backend data" `grep -r 'Please be aware that it may take a few minutes to duplicate backend data.' $OUTPUT |wc -l` 1 diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest.sh index 8206647..fc01d16 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest.sh @@ -285,13 +285,13 @@ rlJournalStart rlAssertEquals "len(package_list) == 2" `copr-cli list-packages ${NAME_PREFIX}Project4 | jq '. | length'` 2 ## Package reseting - rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project4 --name test_package_reset --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project4 --name test_package_reset --clone-url $COPR_HELLO_GIT" # before reset rlRun "copr-cli get-package ${NAME_PREFIX}Project4 --name test_package_reset > $OUTPUT" cat $OUTPUT | jq '.source_dict' > $SOURCE_DICT rlAssertEquals "package.source_type == \"scm\"" `cat $OUTPUT | jq '.source_type'` '"scm"' - rlAssertEquals "package.source_dict.clone_url == \"http://github.com/clime/example.git\"" `cat $SOURCE_DICT | jq '.clone_url'` '"http://github.com/clime/example.git"' + rlAssertEquals "package.source_dict.clone_url == \"$COPR_HELLO_GIT\"" `cat $SOURCE_DICT | jq '.clone_url'` "\"$COPR_HELLO_GIT\"" # _do_ reset rlRun "copr-cli reset-package ${NAME_PREFIX}Project4 --name test_package_reset" @@ -306,7 +306,7 @@ rlJournalStart rlAssertEquals "len(package_list) == 3" `copr-cli list-packages ${NAME_PREFIX}Project4 | jq '. | length'` 3 ## Package deletion - rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project4 --name test_package_delete --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project4 --name test_package_delete --clone-url $COPR_HELLO_GIT" rlRun "copr-cli get-package ${NAME_PREFIX}Project4 --name test_package_delete > /dev/null" ## Package listing @@ -320,7 +320,7 @@ rlJournalStart ## Test package listing attributes rlRun "copr-cli create --chroot $CHROOT ${NAME_PREFIX}Project5" - rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project5 --name example --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project5 --name example --clone-url $COPR_HELLO_GIT" BUILDS=`mktemp` LATEST_BUILD=`mktemp` @@ -338,10 +338,10 @@ rlJournalStart TMP=`mktemp -d` # run the build and wait - rlRun "copr-cli buildscm --clone-url http://github.com/clime/example.git ${NAME_PREFIX}Project5 | grep 'Created builds:' | sed 's/Created builds: \([0-9][0-9]*\)/\1/g' > $TMP/succeeded_example_build_id" + rlRun "copr-cli buildscm --clone-url $COPR_HELLO_GIT ${NAME_PREFIX}Project5 | grep 'Created builds:' | sed 's/Created builds: \([0-9][0-9]*\)/\1/g' > $TMP/succeeded_example_build_id" # this build should fail - rlRun "copr-cli buildscm --clone-url http://github.com/clime/example.git --commit noluck ${NAME_PREFIX}Project5 | grep 'Created builds:' | sed 's/Created builds: \([0-9][0-9]*\)/\1/g' > $TMP/failed_example_build_id" + rlRun "copr-cli buildscm --clone-url $COPR_HELLO_GIT --commit noluck ${NAME_PREFIX}Project5 | grep 'Created builds:' | sed 's/Created builds: \([0-9][0-9]*\)/\1/g' > $TMP/failed_example_build_id" # run the tests after build rlRun "copr-cli get-package ${NAME_PREFIX}Project5 --name example --with-all-builds --with-latest-build --with-latest-succeeded-build > $OUTPUT" @@ -368,7 +368,7 @@ rlJournalStart rlRun "copr-cli create --chroot $CHROOT --chroot fedora-rawhide-x86_64 ${NAME_PREFIX}Project6" # create a package - rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project6 --name test_package_scm --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project6 --name test_package_scm --clone-url $COPR_HELLO_GIT" # build the package rlRun "copr-cli build-package --name test_package_scm ${NAME_PREFIX}Project6 --timeout 10000 -r $CHROOT" # TODO: timeout not honored @@ -404,7 +404,7 @@ rlJournalStart rlRun "copr-cli create --chroot $CHROOT --chroot fedora-rawhide-x86_64 ${NAME_PREFIX}Project9" && sleep 65 rlRun "curl -X POST $FRONTEND_URL/coprs/update_search_index/" rlRun "curl $FRONTEND_URL/coprs/fulltext/?fulltext=${NAME_VAR}Project9 --silent | grep -E \"href=.*${NAME_VAR}Project9.*\"" 1 # search results _not_ returned - rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project9 --name test_package_scm --clone-url http://github.com/clime/example.git" # insert package to the copr + rlRun "copr-cli add-package-scm ${NAME_PREFIX}Project9 --name test_package_scm --clone-url $COPR_HELLO_GIT" # insert package to the copr rlRun "curl -X POST $FRONTEND_URL/coprs/update_search_index/" # update the index again rlRun "curl $FRONTEND_URL/coprs/fulltext/?fulltext=${NAME_VAR}Project9 --silent | grep -E \"href=.*${NAME_VAR}Project9.*\"" 0 # search results are returned now @@ -471,7 +471,7 @@ rlJournalStart # FIXME: this test is not a reliable reproducer. Depends on timing as few others. # TODO: Remove this. rlRun "copr-cli create ${NAME_PREFIX}TestConsequentDeleteActions --chroot $CHROOT" 0 - rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestConsequentDeleteActions --name example --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestConsequentDeleteActions --name example --clone-url $COPR_HELLO_GIT" rlRun "copr-cli build-package --name example ${NAME_PREFIX}TestConsequentDeleteActions" rlAssertEquals "Test that the project was successfully created on backend" `curl -w '%{response_code}' -silent -o /dev/null $BACKEND_URL/results/${NAME_PREFIX}TestConsequentDeleteActions/` 200 rlRun "python3 <<< \"from copr.client import CoprClient; client = CoprClient.create_from_file_config('/root/.config/copr'); client.delete_package('${NAME_VAR}TestConsequentDeleteActions', 'example', '$OWNER'); client.delete_project('${NAME_VAR}TestConsequentDeleteActions', '$OWNER')\"" @@ -481,7 +481,7 @@ rlJournalStart # Bug 1368259 - Deleting a build from a group project doesn't delete backend files TMP=`mktemp -d` rlRun "copr-cli create ${NAME_PREFIX}TestDeleteGroupBuild --chroot $CHROOT" 0 - rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestDeleteGroupBuild --name example --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestDeleteGroupBuild --name example --clone-url $COPR_HELLO_GIT" rlRun "copr-cli build-package --name example ${NAME_PREFIX}TestDeleteGroupBuild | grep 'Created builds:' | sed 's/Created builds: \([0-9][0-9]*\)/\1/g' > $TMP/TestDeleteGroupBuild_example_build_id.txt" BUILD_ID=`cat $TMP/TestDeleteGroupBuild_example_build_id.txt` MYTMPDIR=`mktemp -d -p .` && cd $MYTMPDIR @@ -507,15 +507,15 @@ rlJournalStart # Bug 1370704 - Internal Server Error (too many values to unpack) rlRun "copr-cli create ${NAME_PREFIX}TestBug1370704 --chroot $CHROOT" 0 - rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestBug1370704 --name example --clone-url http://github.com/clime/example.git" + rlRun "copr-cli add-package-scm ${NAME_PREFIX}TestBug1370704 --name example --clone-url $COPR_HELLO_GIT" rlRun "copr-cli build-package --name example ${NAME_PREFIX}TestBug1370704" rlAssertEquals "Test OK return code from the monitor API" `curl -w '%{response_code}' -silent -o /dev/null ${FRONTEND_URL}/api/coprs/${NAME_PREFIX}TestBug1370704/monitor/` 200 # Bug 1393361 - get_project_details returns incorrect yum_repos rlRun "copr-cli create ${NAME_PREFIX}TestBug1393361-1 --chroot $CHROOT" 0 rlRun "copr-cli create ${NAME_PREFIX}TestBug1393361-2 --chroot $CHROOT" 0 - rlRun "copr-cli buildscm ${NAME_PREFIX}TestBug1393361-2 --clone-url https://github.com/clime/example.git" 0 - rlRun "copr-cli buildscm ${NAME_PREFIX}TestBug1393361-1 --clone-url https://github.com/clime/example.git" 0 + rlRun "copr-cli buildscm ${NAME_PREFIX}TestBug1393361-2 --clone-url $COPR_HELLO_GIT" 0 + rlRun "copr-cli buildscm ${NAME_PREFIX}TestBug1393361-1 --clone-url $COPR_HELLO_GIT" 0 rlRun "curl --silent ${FRONTEND_URL}/api/coprs/${NAME_PREFIX}TestBug1393361-1/detail/ | grep TestBug1393361-1/$CHROOT" 0 rlRun "curl --silent ${FRONTEND_URL}/api/coprs/${NAME_PREFIX}TestBug1393361-2/detail/ | grep TestBug1393361-2/$CHROOT" 0 @@ -542,8 +542,8 @@ rlJournalStart ## test building in copr dirs rlRun "copr-cli create --chroot $CHROOT ${NAME_PREFIX}CoprDirTest" - rlRun "copr-cli add-package-scm ${NAME_PREFIX}CoprDirTest --name example --clone-url http://github.com/clime/example.git" 0 - rlRun "copr-cli buildscm ${NAME_PREFIX}CoprDirTest:example --clone-url https://github.com/clime/example.git" 0 + rlRun "copr-cli add-package-scm ${NAME_PREFIX}CoprDirTest --name example --clone-url $COPR_HELLO_GIT" 0 + rlRun "copr-cli buildscm ${NAME_PREFIX}CoprDirTest:example --clone-url $COPR_HELLO_GIT" 0 ### ---- DELETING PROJECTS ------- ### # delete - wrong project name diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh b/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh index f5c4879..a5c7e0e 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/scm.sh @@ -32,6 +32,7 @@ # Load config settings HERE=$(dirname "$(realpath "$0")") source "$HERE/config" +source "$HERE/helpers" rlJournalStart @@ -41,14 +42,14 @@ rlJournalStart rlPhaseStartTest 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 "$COPR_HELLO_GIT" --method make_srpm ${NAME_PREFIX}BuildScm" 0 + rlRun "copr buildscm --clone-url "$COPR_HELLO_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 $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 add-package-scm --name example --clone-url $COPR_HELLO_GIT --method tito ${NAME_PREFIX}PackageScm" 0 + rlRun "copr edit-package-scm --name example --clone-url $COPR_HELLO_GIT --method rpkg ${NAME_PREFIX}PackageScm" 0 rlRun "copr build-package --name example ${NAME_PREFIX}PackageScm" 0 rlRun "copr-cli delete ${NAME_PREFIX}BuildScm"