| |
@@ -1,10 +1,9 @@
|
| |
- %if (0%{?fedora} < 28)
|
| |
- # tests are failling in f28 with new version of pytest
|
| |
+ %if 0%{?fedora}
|
| |
# rhel/epel has no flexmock, pytest-capturelog
|
| |
%global with_check 1
|
| |
%endif
|
| |
|
| |
- %global commit 8260985f2a8f24a59bfdb5405a5f9303191bdfb7
|
| |
+ %global commit b2a5fac97fa9880b23ac835d01dd99e29d2938a5
|
| |
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
| |
|
| |
# set to 0 to create a normal release
|
| |
@@ -12,7 +11,7 @@
|
| |
|
| |
%if 0%{?dev_release}
|
| |
%global postrelease dev
|
| |
- %global release 2
|
| |
+ %global release 1
|
| |
%else
|
| |
%global postrelease 0
|
| |
%global release 1
|
| |
@@ -21,7 +20,7 @@
|
| |
%global osbs_obsolete_vr 0.14-2
|
| |
|
| |
Name: osbs-client
|
| |
- Version: 0.52
|
| |
+ Version: 0.54
|
| |
%if "x%{postrelease}" != "x0"
|
| |
Release: %{release}.%{postrelease}.git.%{shortcommit}%{?dist}
|
| |
%else
|
| |
@@ -42,9 +41,9 @@
|
| |
BuildRequires: python3-devel
|
| |
BuildRequires: python3-setuptools
|
| |
%if 0%{?with_check}
|
| |
+ BuildRequires: git-core
|
| |
BuildRequires: python3-dateutil
|
| |
BuildRequires: python3-pytest
|
| |
- BuildRequires: python3-pytest-capturelog
|
| |
BuildRequires: python3-flexmock
|
| |
BuildRequires: python3-six
|
| |
BuildRequires: python3-dockerfile-parse
|
| |
@@ -74,6 +73,7 @@
|
| |
Requires: python3-six
|
| |
Requires: krb5-workstation
|
| |
Requires: python3-PyYAML
|
| |
+ Requires: git-core
|
| |
|
| |
Provides: python3-osbs = %{version}-%{release}
|
| |
Obsoletes: python3-osbs < %{osbs_obsolete_vr}
|
| |
@@ -91,6 +91,10 @@
|
| |
# Remove this test, it tries to hit httpbin.org which fails the build in koji
|
| |
rm -f tests/test_http.py
|
| |
|
| |
+ # Tests using git clone are failing in koji: skip them.
|
| |
+ sed -i '/^def test_get_repo_info(/i @pytest.mark.skip()' tests/test_utils.py
|
| |
+ sed -i '/^def test_checkout_git_repo(/i @pytest.mark.skip()' tests/test_utils.py
|
| |
+
|
| |
%build
|
| |
%py3_build
|
| |
|
| |
@@ -121,6 +125,13 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Wed Mar 20 2019 Athos Ribeiro <athoscr@fedoraproject.org> - 0.54-1
|
| |
+ - Update to latest upstream
|
| |
+
|
| |
+ * Wed Mar 20 2019 Athos Ribeiro <athoscr@fedoraproject.org> - 0.53-1
|
| |
+ - Update to latest upstream
|
| |
+ - Re-enable test suite
|
| |
+
|
| |
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.52-1
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
| |
|
| |
athoscr
commented 5 years ago
osbs-client 0.53 was just released
Note that the git ref is pointing to the commit tagged 0.53 in osbs-client upstream repo, while upstream spec file points to a previous commit for the same version (the only change was a bump in the spec file).
scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=31939444
update: now updating to v0.54
scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=33652168