diff --git a/beaker-tests/files/etc/rpkg.conf b/beaker-tests/files/etc/rpkg.conf index ebf2906..43c8996 100644 --- a/beaker-tests/files/etc/rpkg.conf +++ b/beaker-tests/files/etc/rpkg.conf @@ -1,5 +1,5 @@ [distgit] lookaside = http://pkgs.example.org/repo/pkgs/%(pkg)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s lookaside_cgi = https://pkgs.example.org/repo/pkgs/upload.cgi -gitbaseurl = ssh://clime@pkgs.example.org/%(module)s +gitbaseurl = ssh://clime@pkgs.example.org/var/lib/dist-git/git/%(module)s anongiturl = git://pkgs.example.org/%(module)s diff --git a/beaker-tests/files/etc/rpkg/fedpkg.conf b/beaker-tests/files/etc/rpkg/fedpkg.conf index 8a88d4d..7ae21c4 100644 --- a/beaker-tests/files/etc/rpkg/fedpkg.conf +++ b/beaker-tests/files/etc/rpkg/fedpkg.conf @@ -2,7 +2,7 @@ lookaside = http://pkgs.example.org/repo/pkgs lookasidehash = sha512 lookaside_cgi = https://pkgs.example.org/repo/pkgs/upload.cgi -gitbaseurl = ssh://clime@pkgs.example.org/%(module)s +gitbaseurl = ssh://clime@pkgs.example.org/var/lib/dist-git/git/%(module)s anongiturl = git://pkgs.example.org/%(module)s tracbaseurl = https://clime:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ diff --git a/beaker-tests/tests/basic-test/manifest.js.prev b/beaker-tests/tests/basic-test/manifest.js.prev new file mode 100644 index 0000000..729bd4f --- /dev/null +++ b/beaker-tests/tests/basic-test/manifest.js.prev @@ -0,0 +1 @@ +{"/prunerepo.git": {"owner": null, "fingerprint": "0b75e76a72fd50ae37aa3fd706f6d28fa9c4a4d6", "description": "prunerepo", "reference": null, "modified": 1517593891}} \ No newline at end of file diff --git a/beaker-tests/tests/basic-test/prunerepo b/beaker-tests/tests/basic-test/prunerepo new file mode 160000 index 0000000..b546f41 --- /dev/null +++ b/beaker-tests/tests/basic-test/prunerepo @@ -0,0 +1 @@ +Subproject commit b546f41b8974b2736c461ede35fb5e88fdc5fd38 diff --git a/beaker-tests/tests/basic-test/prunerepo-copy b/beaker-tests/tests/basic-test/prunerepo-copy new file mode 160000 index 0000000..a265563 --- /dev/null +++ b/beaker-tests/tests/basic-test/prunerepo-copy @@ -0,0 +1 @@ +Subproject commit a265563d8e26994c819234fdf646bf852eebdd22 diff --git a/beaker-tests/tests/basic-test/prunerepo-copy2 b/beaker-tests/tests/basic-test/prunerepo-copy2 new file mode 160000 index 0000000..a265563 --- /dev/null +++ b/beaker-tests/tests/basic-test/prunerepo-copy2 @@ -0,0 +1 @@ +Subproject commit a265563d8e26994c819234fdf646bf852eebdd22 diff --git a/beaker-tests/tests/basic-test/run.sh b/beaker-tests/tests/basic-test/run.sh index 03e9d03..eebc086 100755 --- a/beaker-tests/tests/basic-test/run.sh +++ b/beaker-tests/tests/basic-test/run.sh @@ -81,7 +81,7 @@ rlJournalStart rlPhaseStartCleanup BasicTest rm -rf $TESTPATH/prunerepo $TESTPATH/prunerepo-copy* $TESTPATH/prunerepo2 $TESTPATH/prunerepo-1.1.tar.gz $TESTPATH/manifest* - pkgs_cmd 'rm -rf /var/lib/dist-git/git/prunerepo.git' - pkgs_cmd 'sudo rm -rf /var/lib/dist-git/cache/lookaside/pkgs/prunerepo' + #pkgs_cmd 'rm -rf /var/lib/dist-git/git/prunerepo.git' + #pkgs_cmd 'sudo rm -rf /var/lib/dist-git/cache/lookaside/pkgs/prunerepo' rlPhaseEnd rlJournalEnd &> /dev/null diff --git a/beaker-tests/tests/basic-test/sources b/beaker-tests/tests/basic-test/sources new file mode 100644 index 0000000..90af5e5 --- /dev/null +++ b/beaker-tests/tests/basic-test/sources @@ -0,0 +1 @@ +manifest test