X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;fp=trusty%2Fdebian%2Frules;h=748eaad56f19aeb7dadeee14f866506128ea2d19;hb=a42d83a2e927765c076e2b15a8edcb33cd1872d5;hp=1bb4557a8156f0e7182420e028cc41d363655548;hpb=9475ccc71fba95de7316c83c45ab913066e01a14;p=openstack-build%2Fneutron-build.git diff --git a/trusty/debian/rules b/trusty/debian/rules index 1bb4557a8..748eaad56 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -16,16 +16,14 @@ override_dh_installinit: override_dh_auto_clean: dh_clean -get-orig-source: - uscan --verbose --force-download --rename --destdir=../build-area - -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - # Unpatch quantum configuration to fixup tests which conflict - # with a core_plugin being set. - patch -p1 -R < debian/patches/fix-neutron-configuration.patch - # Set a reasonable level of concurrency - ./run_tests.sh -N -P --concurrency=4 - # Patch configuration file after testing - patch -p1 < debian/patches/fix-neutron-configuration.patch +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + # Unpatch quantum configuration to fixup tests which conflict + # with a core_plugin being set. + patch -p1 -R < debian/patches/fix-neutron-configuration.patch + # Set a reasonable level of concurrency + ./run_tests.sh -N -P --concurrency=4 + # Patch configuration file after testing + patch -p1 < debian/patches/fix-neutron-configuration.patch endif +