Comment 12 for bug 1529027

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

Reviewed: https://review.openstack.org/283693
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=865b5f7032c9f68fb011b108d32aba1c7cbd5120
Submitter: Jenkins
Branch: stable/liberty

commit 865b5f7032c9f68fb011b108d32aba1c7cbd5120
Author: Paul Michali <email address hidden>
Date: Tue Feb 16 15:45:54 2016 -0500

    Use constraints on all targets.

    The neutron-vpnaas repo already has converted to using constraints for
    targets. However, the TC recommendation is to use constraints on the
    original job names (pep8, py27,...), instead of using the constrained
    names (e.g. pep8-constraints).

    A separate commit (I34f0b355703fe0133f160afd4e32f2272d41ecaa) restored
    the use of the non-constraint NAMED jobs for Liberty and newer.

    This commit modifies those non-constraints targets so that they use
    constraints. A manual check was made that each target used the same
    package versions for both constraints and non-constraints targets.

    Then, after both constraints and non-constraints jobs passed in Jenkins
    (before and after the project-config commit was upstreamed), the constraints
    based targets were removed from tox.ini.

    Note: Found out that infra doesn't support constraints based cover and
    releasenotes. Added TODO to these targets so that they can be updated,
    if and when constraints are supported.

    Note: In the gate hook, config_for_vpn_func_testing.sh calls Neutron's
    config_for_func_testing.sh, which will setup files in the venv. To prevent
    that script from modifying the VENV variable to have -constraints suffix
    and store files in the wrong venv, we turn off USE_CONSTRAINT_ENV, prior
    to calling the Neutron script.

    Once this is upstreamed, we can backport this fix to Liberty to complete
    the effort for this repo.

    Conflicts:
     neutron_vpnaas/tests/contrib/gate_hook.sh
     tox.ini

    Depends-On: I34f0b355703fe0133f160afd4e32f2272d41ecaa
    Partial-Bug: #1522503
    (cherry picked from commit 73a6ad9a13d4b6c2d9efe7d9ec142514fc6904f2)

    Also squashed the following follow up fixes:

    ===

    VPNaaS: Cleanup constraints in tox.ini

    Missed changing the envlist to not specify constraints based target
    names for master (where constraints are used by default). This
    simple commit cleans that up.

    Conflicts:
     tox.ini

    Change-Id: I9d11cfd47adae3f49d33e5db8c916ebd983a8f96
    Related-Bug: #1522503
    (cherry picked from commit ad122cf23c296c9dc657a2d92abcb0ff316e8d99)

    ===

    Fix tox.ini constraints for post jobs

    Post jobs are currently failing since constraints are not available but
    required by this tox.ini file. Change venv environment to work without
    constraints.

    Change-Id: I736be6a49f919302c31fc7ebd8251cb0a0d73853
    (cherry picked from commit cf9e80a16fbfcadd39322760969b342a8191cc96)

    ===

    Don't use constrained environment for functional tests

    Closes-Bug: #1529027
    Depends-On: I3a4f1d61d13f1e444f7624d68d121d04d81eb724
    Change-Id: I8291c7cded5fad3227cda0d301dae24e110b6258
    (cherry picked from commit a1cabc194320072a84576e2fa5654fc90c377471)

    ===

    Change-Id: I4a2410ab80e6018f1b65b2288ae66312eb49cb27