[rpms/fedpkg] 1.48-1: Disable lookaside_namespaced and revert to use original anongiturl

[Chenxiong Qi <cqi@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 87ea28e7e2ddbd8f9c81c9ac98ed4a171ce8a3af
            Author : Chenxiong Qi <cqi@redhat.com>
            Date   : 2017-10-27T16:18:01+08:00
            Stats  : +95/-1 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/87ea28e7e2ddbd8f9c81c9ac98ed4a171ce8a3af?branch=1.48-1

            Log:
            Disable lookaside_namespaced and revert to use original anongiturl

As of releasing fedpkg-1.30-1, lookaside cache upload.cgi is not ready
to support namespaced repo name in Fedora infra. Disable this before
it gets fixed and deployed to prod.

Unfortunately, it is the process in Fedora 27 final freeze when
releasing 1.30-1. Configuration has to be modified in infra ansible
after this process finishes. At this moment, revert to original
anongiturl. Remove this revert when configuration is done in infra.

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---
diff --git a/disable-lookaside_namespaced.patch b/disable-lookaside_namespaced.patch
new file mode 100644
index 0000000..561978c
--- /dev/null
+++ b/disable-lookaside_namespaced.patch
@@ -0,0 +1,24 @@
+diff -up fedpkg-1.30/conf/etc/rpkg/fedpkg.conf.origin fedpkg-1.30/conf/etc/rpkg/fedpkg.conf
+--- fedpkg-1.30/conf/etc/rpkg/fedpkg.conf.origin	2017-10-27 15:03:15.123604965 +0800
++++ fedpkg-1.30/conf/etc/rpkg/fedpkg.conf	2017-10-27 15:03:28.391594849 +0800
+@@ -14,7 +14,7 @@ clone_config =
+   bz.default-component %(module)s
+   sendemail.to %(module)s-owner@fedoraproject.org
+ distgit_namespaced = True
+-lookaside_namespaced = True
++lookaside_namespaced = False
+ kerberos_realms = FEDORAPROJECT.ORG
+ 
+ [fedpkg.bodhi]
+diff -up fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf.origin fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf
+--- fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf.origin	2017-10-27 15:03:19.497601630 +0800
++++ fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf	2017-10-27 15:03:40.631585517 +0800
+@@ -14,7 +14,7 @@ clone_config =
+   bz.default-component %(module)s
+   sendemail.to %(module)s-owner@fedoraproject.org
+ distgit_namespaced = True
+-lookaside_namespaced = True
++lookaside_namespaced = False
+ kerberos_realms = STG.FEDORAPROJECT.ORG
+ 
+ [fedpkg-stage.bodhi]

diff --git a/fedpkg.spec b/fedpkg.spec
index d1332ea..9103a4a 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -8,13 +8,15 @@
 
 Name:           fedpkg
 Version:        1.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
+Patch0:         disable-lookaside_namespaced.patch
+Patch1:         revert-to-use-original-anongiturl.patch
 
 BuildArch:      noarch
 
@@ -66,6 +68,8 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -109,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 27 2017 Chenxiong Qi <cqi@redhat.com> - 1.30-2
+- Disable lookaside_namespaced and revert to use git:// anongiturl
+
 * Fri Oct 20 2017 Chenxiong Qi <cqi@redhat.com> - 1.30-1
 - Tests for update command (cqi)
 - Add support for module commands (mprahl)

diff --git a/revert-to-use-original-anongiturl.patch b/revert-to-use-original-anongiturl.patch
new file mode 100644
index 0000000..50a8497
--- /dev/null
+++ b/revert-to-use-original-anongiturl.patch
@@ -0,0 +1,63 @@
+diff -up fedpkg-1.30/conf/etc/rpkg/fedpkg.conf.origin fedpkg-1.30/conf/etc/rpkg/fedpkg.conf
+--- fedpkg-1.30/conf/etc/rpkg/fedpkg.conf.origin	2017-10-27 15:26:56.973108529 +0800
++++ fedpkg-1.30/conf/etc/rpkg/fedpkg.conf	2017-10-27 15:28:46.836006957 +0800
+@@ -3,7 +3,7 @@ lookaside = https://src.fedoraproject.or
+ lookasidehash = sha512
+ lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(module)s
+-anongiturl = https://src.fedoraproject.org/git/%(module)s
++anongiturl = git://pkgs.fedoraproject.org/%(module)s
+ branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
+ kojiprofile = koji
+ build_client = koji
+diff -up fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf.origin fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf
+--- fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf.origin	2017-10-27 15:26:53.629111621 +0800
++++ fedpkg-1.30/conf/etc/rpkg/fedpkg-stage.conf	2017-10-27 15:28:35.172017741 +0800
+@@ -3,7 +3,7 @@ lookaside = https://src.stg.fedoraprojec
+ lookasidehash = sha512
+ lookaside_cgi = https://src.stg.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.stg.fedoraproject.org/%(module)s
+-anongiturl = https://src.stg.fedoraproject.org/git/%(module)s
++anongiturl = git://pkgs.stg.fedoraproject.org/%(module)s
+ branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
+ kojiprofile = stg
+ build_client = koji
+diff -up fedpkg-1.30/fedpkg/__init__.py.origin fedpkg-1.30/fedpkg/__init__.py
+--- fedpkg-1.30/fedpkg/__init__.py.origin	2017-10-27 15:27:08.801097594 +0800
++++ fedpkg-1.30/fedpkg/__init__.py	2017-10-27 15:27:20.441086832 +0800
+@@ -196,14 +196,6 @@ class Commands(pyrpkg.Commands):
+         in Koji.
+         """
+ 
+-    def construct_build_url(self):
+-        """Override build URL for Fedora Koji build
+-
+-        In Fedora Koji, anonymous URL should have prefix "git+https://"
+-        """
+-        url = super(Commands, self).construct_build_url()
+-        return 'git+{0}'.format(url)
+-
+     def retire(self, message):
+         """Delete all tracked files and commit a new dead.package file
+ 
+diff -up fedpkg-1.30/test/test_commands.py.origin fedpkg-1.30/test/test_commands.py
+--- fedpkg-1.30/test/test_commands.py.origin	2017-10-27 15:27:02.754103184 +0800
++++ fedpkg-1.30/test/test_commands.py	2017-10-27 15:27:37.139071395 +0800
+@@ -326,17 +326,3 @@ class TestFindMasterBranch(CommandTestCa
+ 
+         koji_session.getBuildTarget.assert_called_once_with('rawhide')
+         self.assertEqual('28', result)
+-
+-
+-class TestOverrideBuildURL(CommandTestCase):
+-    """Test Commands.construct_build_url"""
+-
+-    @patch('pyrpkg.Commands.construct_build_url')
+-    def test_override(self, super_construct_build_url):
+-        super_construct_build_url.return_value = 'https://localhost/rpms/pkg'
+-        cmd = self.make_commands()
+-
+-        overrided_url = cmd.construct_build_url()
+-        self.assertEqual(
+-            'git+{0}'.format(super_construct_build_url.return_value),
+-            overrided_url)