From 1e35fe1b77e6db03c02b62aed26b73f2e411c4ef Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Feb 07 2018 17:14:41 +0000
Subject: Merge branch 'master' into f27


* master:
  Fix multi arch failing unit test
  add new sources for pull request changes to spec
  Update to version 1.6.29
  Fix version in changelog
  Update to 1.6.28

---

diff --git a/atomic-reactor-fix-multiarch-test.patch b/atomic-reactor-fix-multiarch-test.patch
new file mode 100644
index 0000000..d1cd519
--- /dev/null
+++ b/atomic-reactor-fix-multiarch-test.patch
@@ -0,0 +1,26 @@
+From ae8d611b51c1046ad0aa2a8b523e0d1391916d94 Mon Sep 17 00:00:00 2001
+From: Clement Verna <cverna@tutanota.com>
+Date: Thu, 1 Feb 2018 10:15:16 +0100
+Subject: [PATCH 1/1] Add multi arch support for failing test
+
+Signed-off-by: Clement Verna <cverna@tutanota.com>
+---
+ tests/plugins/test_koji_upload.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/plugins/test_koji_upload.py b/tests/plugins/test_koji_upload.py
+index 8142aac..4bd221a 100644
+--- a/tests/plugins/test_koji_upload.py
++++ b/tests/plugins/test_koji_upload.py
+@@ -924,7 +924,7 @@ class TestKojiUpload(object):
+                                             prefer_schema1_digest=prefer_schema1_digest,
+                                             )
+         runner = create_runner(tasker, workflow, blocksize=blocksize, target=target,
+-                               prefer_schema1_digest=prefer_schema1_digest)
++                               prefer_schema1_digest=prefer_schema1_digest, platform=LOCAL_ARCH)
+         runner.run()
+ 
+         data = get_metadata(workflow, osbs)
+-- 
+2.14.3
+
diff --git a/atomic-reactor.spec b/atomic-reactor.spec
index dc19d78..27a7d3d 100644
--- a/atomic-reactor.spec
+++ b/atomic-reactor.spec
@@ -32,7 +32,7 @@
 
 Name:           %{project}
 Version:        1.6.29
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Improved builder for Docker images
 Group:          Development/Tools
@@ -46,6 +46,13 @@ Source0:        https://github.com/%{owner}/%{project}/archive/%{commit}/%{proje
 # upstream (at the time of this writing). Switching to the 2.x release
 Patch0:         atomic-reactor-fix-docker-py-requires.patch
 
+# Need to fix the unit test for non x86_64 arch
+#
+# Submitted upstream
+#
+# https://github.com/projectatomic/atomic-reactor/pull/906
+Patch1:         atomic-reactor-fix-multiarch-test.patch
+
 BuildArch:      noarch
 
 %if 0%{?with_check}
@@ -61,7 +68,7 @@ BuildRequires:  python-dockerfile-parse >= 0.0.5
 BuildRequires:  python2-docker
 BuildRequires:  python-flexmock >= 0.10.2
 BuildRequires:  python-six
-BuildRequires:  python2-osbs-client >= 0.15
+BuildRequires:  python2-osbs-client >= 0.45
 BuildRequires:  python-backports-lzma
 BuildRequires:  python2-responses
 BuildRequires:  python-jsonschema
@@ -89,7 +96,7 @@ BuildRequires:  python3-dockerfile-parse >= 0.0.5
 BuildRequires:  python3-docker
 BuildRequires:  python3-flexmock >= 0.10.2
 BuildRequires:  python3-six
-BuildRequires:  python3-osbs-client >= 0.15
+BuildRequires:  python3-osbs-client >= 0.45
 BuildRequires:  python3-responses
 BuildRequires:  python3-jsonschema
 BuildRequires:  python3-PyYAML
@@ -239,6 +246,7 @@ Plugins for automated rebuilds
 %setup -qn %{name}-%{commit}
 
 %patch0 -p0
+%patch1 -p1
 
 %build
 %py2_build
@@ -424,6 +432,10 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests
 
 
 %changelog
+* Thu Feb 01 2018 Clement Verna <cverna@fedoraproject.orf> - 1.6.29-2
+- Added patch to fix unit test on multi arch
+- Build Requires osbs-client version 0.45 for unit test
+
 * Thu Jan 18 2018 Clement Verna <cverna@fedoraproject.org> - 1.6.29-1
 - Update to latest upstream