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@redhat.com>
Signed-off-by: Yaniv Bronhaim <ybronhei@redhat.com>
Reviewed-on: https://gerrit.ovirt.org/54685
Continuous-Integration: Jenkins CI

Makefile.am

@@ -118,13 +118,9 @@ pep8: all
 
 .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

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

automation/check-merged.packages.el7

@@ -0,0 +1,31 @@
+autoconf
+automake
+git
+lago
+lago-ovirt
+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
+python34
+rpm-build
+sudo
+yum
+yum-utils
+# Needed by lago
+grubby

automation/check-merged.packages → automation/check-merged.packages.fc23

@@ -3,7 +3,6 @@ automake
 git
 lago
 lago-ovirt
-lago-ovirt-extras
 libguestfs-tools-c
 m2crypto
 make

automation/check-patch.packages.el7

@@ -0,0 +1,31 @@
+autoconf
+automake
+git
+lago
+lago-ovirt
+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
+python34
+rpm-build
+sudo
+yum
+yum-utils
+# Needed by lago
+grubby

automation/check-patch.repos.el7

@@ -3,3 +3,4 @@ ovirt-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-stati
 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,http://download.fedoraproject.org/pub/epel/7/x86_64

tests/Makefile.am

@@ -257,7 +257,5 @@ check-local:
 	@echo '*** into your environment.  Do not submit untested code!    ***'
 	$(top_srcdir)/tests/run_tests_local.sh $(args) crossImportsTests.py
 	$(top_srcdir)/tests/run_tests_local.sh $(args) $(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);

vdsm.spec.in

@@ -81,7 +81,10 @@ BuildRequires: qemu-img
 BuildRequires: rpm-python
 BuildRequires: python-blivet
 
-%if "@PYTHON3@" != ""
+%if 0%{?rhel}
+BuildRequires: python34-nose
+BuildRequires: python34-six
+%else
 BuildRequires: python3-nose
 BuildRequires: python3-six
 %endif