Change in vdsm[master]: el7: require newly available python34-nose
danken at redhat.com
danken at redhat.com
Sun Mar 13 09:51:14 UTC 2016
Dan Kenigsberg has uploaded a new change for review.
Change subject: el7: require newly available python34-nose
......................................................................
el7: require newly available python34-nose
Recently, (as of rhbz#1294865 and rhbz#1294862) six and nose are
available to python3 users via EPEL7. This patch requires their
availability on build hosts.
Change-Id: I8e19a5bbbf71227230bc3c354453e5884dc10764
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M Makefile.am
M automation/build-artifacts.repos.el7
A automation/check-merged.packages.el7
M automation/check-patch.repos.el7
M tests/Makefile.am
M vdsm.spec.in
6 files changed, 43 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/54685/1
diff --git a/Makefile.am b/Makefile.am
index 1dedab5..7c21849 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,13 +118,9 @@
.PHONY: python3
python3: all
- if [ -x "$(PYTHON3)" ]; then \
- PYTHONDONTWRITEBYTECODE=1 $(PYTHON3) -m compileall \
- $(WHITELIST) \
- `find . -name '*.py'`; \
- else \
- echo "Warning: skipping python3 syntax check"; \
- fi
+ PYTHONDONTWRITEBYTECODE=1 $(PYTHON3) -m compileall \
+ $(WHITELIST) \
+ `find . -name '*.py'`; \
# Note: dependencies ordered by time needed to run them
check-recursive: gitignore abs_imports python3 pyflakes pep8
diff --git a/automation/build-artifacts.repos.el7 b/automation/build-artifacts.repos.el7
index 8c8de34..9906a9e 100644
--- a/automation/build-artifacts.repos.el7
+++ b/automation/build-artifacts.repos.el7
@@ -1,2 +1,3 @@
ovirt-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro
ovirt-glusterfs-epel,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/x86_64
+epel,http://download.fedoraproject.org/pub/epel/7/
diff --git a/automation/check-merged.packages.el7 b/automation/check-merged.packages.el7
new file mode 100644
index 0000000..8aa7cd2
--- /dev/null
+++ b/automation/check-merged.packages.el7
@@ -0,0 +1,31 @@
+autoconf
+automake
+git
+lago
+lago-ovirt
+lago-ovirt-extras
+libguestfs-tools-c
+m2crypto
+make
+mom
+policycoreutils-python
+pyflakes
+python-blivet
+python-coverage
+python-devel
+python-inotify
+python-ioprocess
+python-netaddr
+python-nose
+python-pep8
+python-pthreading
+python-rtslib
+python-six
+python34-nose
+python34-six
+rpm-build
+sudo
+yum
+yum-utils
+# Needed by lago
+grubby
diff --git a/automation/check-patch.repos.el7 b/automation/check-patch.repos.el7
index f4d3c47..111a7d6 100644
--- a/automation/check-patch.repos.el7
+++ b/automation/check-patch.repos.el7
@@ -3,3 +3,4 @@
ovirt-glusterfs-epel,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/x86_64
openstack-kilo,https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/
lago,http://resources.ovirt.org/repos/lago/stable/0.0/rpm/$distro
+epel,//download.fedoraproject.org/pub/epel/7/x86_64
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4aabc4c..7597abf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -250,7 +250,5 @@
@echo '*** into your environment. Do not submit untested code! ***'
$(top_srcdir)/tests/run_tests_local.sh crossImportsTests.py
$(top_srcdir)/tests/run_tests_local.sh $(run_modules)
- if [ -x "$(PYTHON3)" ]; then \
- PYTHON_EXE="$(PYTHON3)" $(top_srcdir)/tests/run_tests_local.sh \
- $(test_modules_py3); \
- fi
+ PYTHON_EXE="$(PYTHON3)" $(top_srcdir)/tests/run_tests_local.sh \
+ $(test_modules_py3); \
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 3af57e5..04e1a66 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -81,10 +81,13 @@
BuildRequires: rpm-python
BuildRequires: python-blivet
-%if "@PYTHON3@" != ""
+%if 0%{?rhel} == 7
+BuildRequires: python34-nose
+BuildRequires: python34-six
+%else
BuildRequires: python3-nose
BuildRequires: python3-six
-%endif
+%fi
# Autotools BuildRequires
%if 0%{?enable_autotools}
--
To view, visit https://gerrit.ovirt.org/54685
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e19a5bbbf71227230bc3c354453e5884dc10764
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>
More information about the vdsm-patches
mailing list