From b3a273d816858249e269c2ebfc0027a1f14759d3 Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Sat, 13 Jan 2018 21:20:15 +0100
Subject: [PATCH] add tests with rpkg and move them to basic test

---
 .../prunerepo-1.1-1.fc23.src.rpm              | Bin
 beaker-tests/files/etc/rpkg.conf              |   5 ++
 beaker-tests/setup.sh                         |   1 +
 beaker-tests/tests/basic-test/run.sh          |  21 ++++---
 beaker-tests/tests/fedpkg-test/run.sh         |  52 ++++++++++++++++++
 5 files changed, 70 insertions(+), 9 deletions(-)
 rename beaker-tests/{tests/basic-test => data}/prunerepo-1.1-1.fc23.src.rpm (100%)
 create mode 100644 beaker-tests/files/etc/rpkg.conf
 create mode 100755 beaker-tests/tests/fedpkg-test/run.sh

diff --git a/beaker-tests/tests/basic-test/prunerepo-1.1-1.fc23.src.rpm b/beaker-tests/data/prunerepo-1.1-1.fc23.src.rpm
similarity index 100%
rename from beaker-tests/tests/basic-test/prunerepo-1.1-1.fc23.src.rpm
rename to beaker-tests/data/prunerepo-1.1-1.fc23.src.rpm
diff --git a/beaker-tests/files/etc/rpkg.conf b/beaker-tests/files/etc/rpkg.conf
new file mode 100644
index 0000000..ebf2906
--- /dev/null
+++ b/beaker-tests/files/etc/rpkg.conf
@@ -0,0 +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
+anongiturl = git://pkgs.example.org/%(module)s
diff --git a/beaker-tests/setup.sh b/beaker-tests/setup.sh
index 9d8b1f8..c78a9c4 100755
--- a/beaker-tests/setup.sh
+++ b/beaker-tests/setup.sh
@@ -25,6 +25,7 @@ dnf -y install jq
 dnf -y install git
 dnf -y install wget
 dnf -y install fedpkg
+dnf -y install rpkg
 
 # enable libvirtd for Vagrant (distgit)
 systemctl enable libvirtd && systemctl start libvirtd
diff --git a/beaker-tests/tests/basic-test/run.sh b/beaker-tests/tests/basic-test/run.sh
index 73851a2..03e9d03 100755
--- a/beaker-tests/tests/basic-test/run.sh
+++ b/beaker-tests/tests/basic-test/run.sh
@@ -21,25 +21,28 @@ rlJournalStart
 
         cd $TESTPATH
 
-        # clone repo using fedpkg
-        rlRun "fedpkg clone /var/lib/dist-git/git/prunerepo"
+        # clone repo using rpkg
+        rlRun "rpkg clone /var/lib/dist-git/git/prunerepo"
 
-        cd prunerepo
+        cd prunerepo || exit
         git config user.email "somebody@example.com"
         git config user.name "Some name"
 
         # upload into lookaside and working tree update
-        rlRun "fedpkg import --skip-diffs ../prunerepo-1.1-1.fc23.src.rpm"
+        rlRun "rpkg import --skip-diffs ../../../data/prunerepo-1.1-1.fc23.src.rpm"
 
         # test of presence of the uploaded file
         rlRun 'wget http://pkgs.example.org/repo/pkgs/prunerepo/prunerepo-1.1.tar.gz/sha512/6a6a30c0e8c661176ba0cf7e8f1909a493a298fd5088389f5eb630b577dee157106e5f89dc429bcf2a6fdffe4bc10b498906b9746220882827560bc5f72a1b01/prunerepo-1.1.tar.gz'
 
         # commit of spec and updated sources and push into the git repo
         rlRun "git add -A && git commit -m 'test commit'"
-        rlRun "git push"
+        rlRun "rpkg push"
 
-        # get srpm file using fedpkg
-        rlRun "fedpkg --dist f25 srpm"
+        # https://pagure.io/rpkg-client/issue/4
+        rlRun "rpkg clean -x"
+
+        # get srpm file using rpkg
+        rlRun "rpkg srpm"
 
         cd ..
 
@@ -53,8 +56,8 @@ rlJournalStart
         rlRun "cat manifest.js | grep prunerepo.git"
         mv ./manifest.js manifest.js.prev
 
-        # clone repo using fedpkg
-        rlRun "fedpkg clone /var/lib/dist-git/git/prunerepo prunerepo2"
+        # clone repo using rpkg
+        rlRun "rpkg clone /var/lib/dist-git/git/prunerepo prunerepo2"
 
         cd prunerepo2
         echo "manifest test" > sources
diff --git a/beaker-tests/tests/fedpkg-test/run.sh b/beaker-tests/tests/fedpkg-test/run.sh
new file mode 100755
index 0000000..f2709b2
--- /dev/null
+++ b/beaker-tests/tests/fedpkg-test/run.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /usr/bin/rhts-environment.sh || exit 1
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+export TESTPATH="$( builtin cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+function pkgs_cmd {
+	ssh  -o 'StrictHostKeyChecking no' clime@pkgs.example.org $1
+}
+
+rlJournalStart
+    rlPhaseStartSetup FedpkgTest
+        pkgs_cmd 'git config --global user.email "clime@redhat.com"'
+        pkgs_cmd 'git config --global user.name "clime"'
+        pkgs_cmd '/usr/share/dist-git/setup_git_package prunerepo'
+    rlPhaseEnd
+
+    rlPhaseStartTest FedpkgTest
+        CWD=`pwd`
+
+        cd $TESTPATH
+
+        # clone repo using fedpkg
+        rlRun "fedpkg clone /var/lib/dist-git/git/prunerepo"
+
+        cd prunerepo || exit
+        git config user.email "somebody@example.com"
+        git config user.name "Some name"
+
+        # upload into lookaside and working tree update
+        rlRun "fedpkg import --skip-diffs ../../../data/prunerepo-1.1-1.fc23.src.rpm"
+
+        # test of presence of the uploaded file
+        rlRun 'wget http://pkgs.example.org/repo/pkgs/prunerepo/prunerepo-1.1.tar.gz/sha512/6a6a30c0e8c661176ba0cf7e8f1909a493a298fd5088389f5eb630b577dee157106e5f89dc429bcf2a6fdffe4bc10b498906b9746220882827560bc5f72a1b01/prunerepo-1.1.tar.gz'
+
+        # commit of spec and updated sources and push into the git repo
+        rlRun "git add -A && git commit -m 'test commit'"
+        rlRun "fedpkg push"
+
+        # get srpm file using fedpkg
+        rlRun "fedpkg --dist f27 srpm"
+
+        cd $CWD
+    rlPhaseEnd
+
+    rlPhaseStartCleanup FedpkgTest
+        rm -rf $TESTPATH/prunerepo $TESTPATH/prunerepo-1.1.tar.gz
+        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