Comment 11 for bug 1758062

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to neutron-fwaas (stable/ocata)

Reviewed: https://review.openstack.org/559940
Committed: https://git.openstack.org/cgit/openstack/neutron-fwaas/commit/?id=d28a547fb2f8ff914facb20c03c2878bc4c3a7f9
Submitter: Zuul
Branch: stable/ocata

commit d28a547fb2f8ff914facb20c03c2878bc4c3a7f9
Author: Bertrand Lallau <email address hidden>
Date: Wed Feb 22 16:03:32 2017 +0100

    Fix pep8, py27, pip install error and tempest

    This patch is a squash of four fix that are needed together to have a
    successful zuul run.

    1. pep8 fix (cherry-picked from master:
       87eb1b15be8a4e39f3344f829d1a5b295a37a858 )

    A recent change in pep/pycodingchecks introduced new warnings as part of
    the pep8 target that causes pep8 to fail now.

    This patch fixes code that issued warnings W503,E731,E266,E402

    In addition, old tests which were not ran anyway, and are no longer
    relevant (test_firewall) were deleted.

    Conflicts:
     neutron_fwaas/tests/tempest_plugin/tests/scenario/manager.py

    2. Avoid parameterless pip install

    build-openstack-sphinx-docs jobs fail on all stable branches due to the
    new pip version 10 introduces some previously Warning as Error: in case
    of calling "pip install" without any package name, the command fails.
    tox_install.sh is called during docs job without any package passed to
    pip.

    This patch also disables E402 hacking check because releasenotes/* violates it
    (the issue is not present in Queens+ where
    Ib19f7ea4ea136180f38bc78389f51b6b5d179ab8 is merged).

    Conflicts:
          neutron_fwaas/db/migration/alembic_migrations/versions/queens/expand/876782258a43_create_default_firewall_groups_table.py
          neutron_fwaas/db/migration/alembic_migrations/versions/queens/expand/f24e0d5e5bff_uniq_firewallgroupportassociation0port.py
          neutron_fwaas/services/firewall/fwaas_plugin_v2.py
          neutron_fwaas/db/migration/alembic_migrations/versions/pike/contract/fd38cd995cc0_shared_attribute_for_firewall_resources.py
          neutron_fwaas/tests/unit/extensions/test_firewall.py
          tox.ini

    3. tests: don't rely on configuration files outside tests directory

    Following the similar Neutron change. [1]

    Recently, the way sibling projects are installed were changed.
    It broke networking-midonet gate as neutron-fwaas was installed
    under site-packages, where the etc directory is not available.

    [1] If1f5ebd981cf06558d5102524211799676068889

    Closes-Bug: #1758062

    4. Adding cleanup of router in unit tests

    Resources must be cleanup after each test in order to free
    resources.

    This patch fixes the legacy-neutron-fwaas-v1-dsvm-tempest jobs

    Change-Id: I72aeeac8cbe07f6fc6cb4acf54fb632587d890a0
    (cherry picked from commit 58a62382e939b47d7bb75e985852aa214f9f3cdd)
    (cherry picked from commit 1d884eab72375af862d50045acc2aa7b62985207)
    (cherry picked from commit 200a03439e4393af83f5bca1e0e18f196b024e5d)
    (cherry picked from commit e1231cd6eabb0992820d0c0fdc629c8a96b5f6b9)
    (cherry picked from commit 4f8dc35a056e003fcc7ad8f65368bc8f60163e85)