Add support for constraints based jobs for neutron-vpnaas

Bug #1522503 reported by Paul Michali
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
neutron
Fix Released
High
Paul Michali

Bug Description

Need to modify neutron-fwaas, neutron-lbaas, neutron-vpnaas and neutron-lib projects to support constraints based targets for pep8, cover, and docs.

Create jobs (initially experimental) for pep8 and docs constraints.

This will bring the advanced services projects and neutron-lib in line with what is done in neutron.

Paul Michali (pcm)
Changed in neutron:
assignee: nobody → Paul Michali (pcm)
status: New → In Progress
Henry Gessau (gessau)
Changed in neutron:
importance: Undecided → High
milestone: none → mitaka-2
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to neutron-vpnaas (master)

Reviewed: https://review.openstack.org/250406
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=ef4476a992c69792f04c8787b2d321250711cafc
Submitter: Jenkins
Branch: master

commit ef4476a992c69792f04c8787b2d321250711cafc
Author: Ihar Hrachyshka <email address hidden>
Date: Thu Nov 26 15:23:02 2015 +0100

    Added constraints tox targets

    These are eventually going to be used in gate instead of unconstrained
    jobs. There is some code duplication in commands definitions, but tox
    does not allow to inherit definitions with {posargs} substitution.

    Made tox_install.sh use constraints file to install both the project and
    neutron dependency, if the first argument is 'constrained'.

    Note: To test the docs targets, needed to fix a formatting issue in
    multiple-local-subnets.rst document.

    Change-Id: I699022b285594edf3c5db10fbdac2f904dc42928
    Partial-Bug: #1522503
    Depends-On: Icfc50a0a9330dbc2a59f9bb27f09944bdf0e00d1

Henry Gessau (gessau)
summary: - Add support for constraints based jobs for neutron-*aas
+ Add support for constraints based jobs for neutron-*aas and -lib
Henry Gessau (gessau)
description: updated
description: updated
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to neutron-lbaas (master)

Reviewed: https://review.openstack.org/250383
Committed: https://git.openstack.org/cgit/openstack/neutron-lbaas/commit/?id=0fc57a7ee306b1ce6c3a1c868139fa071c0fa02e
Submitter: Jenkins
Branch: master

commit 0fc57a7ee306b1ce6c3a1c868139fa071c0fa02e
Author: Ihar Hrachyshka <email address hidden>
Date: Thu Nov 26 14:33:38 2015 +0100

    Added constraints tox targets

    These are eventually going to be used in gate instead of unconstrained
    jobs. There is some code duplication in commands definitions, but tox
    does not allow to inherit definitions with {posargs} substitution.

    Made tox_install.sh use constraints file to install both the project and
    neutron dependency, if the the first argument is 'constrained'.

    Change-Id: I699022b285594edf3c5db10fbdac2f904dc42928
    Partial-Bug: #1522503
    Depends-On: Ic2f9bc047f886bf2f9a4646e7f39f3b71f0cfc79

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

Reviewed: https://review.openstack.org/250390
Committed: https://git.openstack.org/cgit/openstack/neutron-fwaas/commit/?id=f8e9f8bf84295b49d682751607918fb7919946ed
Submitter: Jenkins
Branch: master

commit f8e9f8bf84295b49d682751607918fb7919946ed
Author: Ihar Hrachyshka <email address hidden>
Date: Thu Nov 26 15:12:13 2015 +0100

    Added constraints tox targets

    These are eventually going to be used in gate instead of unconstrained
    jobs. There is some code duplication in commands definitions, but tox
    does not allow to inherit definitions with {posargs} substitution.

    Made tox_install.sh use constraints file to install both the project
    and neutron dependency, if the first argument is 'constrained'.

    Change-Id: I699022b285594edf3c5db10fbdac2f904dc42928
    Partial-Bug: #1522503
    Depends-On: I7d43cf950ec9c337da991b1e765b13743c4e18c2

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/257366

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/257372

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/257412

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/258455

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/258456

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/258457

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-vpnaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/257366
Reason: Change ID should match master. Resubmitted with correct ID.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-lbaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/257372
Reason: Change ID should match master. Resubmitted with correct ID.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-fwaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/257412
Reason: Change ID should match master. Resubmitted with correct ID.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to neutron-vpnaas (master)

Fix proposed to branch: master
Review: https://review.openstack.org/263873

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

Reviewed: https://review.openstack.org/263873
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=80f765d498b365c0622a375b78a85ae6e14cdfbc
Submitter: Jenkins
Branch: master

commit 80f765d498b365c0622a375b78a85ae6e14cdfbc
Author: Paul Michali <email address hidden>
Date: Tue Jan 5 14:24:05 2016 -0500

    Add constraints targets support for neutron-vpnaas

    Added support for running the constraints version of DSVM
    functional targets, made constraints targets the default for
    gate invocation, and tested each target variation.

    Removed the functional test coverage related targets, because to
    run them, requires that DSVM is configured (like the functional
    tests).

    This will need I3a2c3c81533ce6145cd16c2a08a4a2af0dfb0d07
    upstreamed, so that the constraints jobs can all be tested
    (as experimental).

    Change-Id: Idb9902418ea2e6f35b00ffb78a8973e49b6e140d
    Partial-Bug: 1522503

Changed in neutron:
milestone: mitaka-2 → mitaka-3
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to neutron-vpnaas (stable/liberty)

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/270958

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

Reviewed: https://review.openstack.org/270958
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=90f8df474f62aff799aa7efb3a990722eb5f08d6
Submitter: Jenkins
Branch: stable/liberty

commit 90f8df474f62aff799aa7efb3a990722eb5f08d6
Author: Paul Michali <email address hidden>
Date: Thu Jan 21 17:40:06 2016 +0000

    Add constraints targets support for neutron-vpnaas

    Added support for running the constraints version of DSVM
    functional targets, made constraints targets the default for
    gate invocation, and tested each target variation.

    Removed the functional test coverage related targets, because to
    run them, requires that DSVM is configured (like the functional
    tests).

    Conflict in tox.ini. Note: coverage target fails to run, but does
    not in baseline either.

    Change-Id: Idb9902418ea2e6f35b00ffb78a8973e49b6e140d
    Partial-Bug: 1522503
    (cherry picked from commit 80f765d498b365c0622a375b78a85ae6e14cdfbc)

tags: added: in-stable-liberty
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to neutron-vpnaas (master)

Fix proposed to branch: master
Review: https://review.openstack.org/280926

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-vpnaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/258455
Reason: Using a different method as recommended by TC (using non-constraint names for constraints).

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-lbaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/258456
Reason: Using a different method as recommended by TC (using non-constraint names for constraints).

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-fwaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/258457
Reason: Using a different method as recommended by TC (using non-constraint names for constraints).

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

Reviewed: https://review.openstack.org/280926
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=73a6ad9a13d4b6c2d9efe7d9ec142514fc6904f2
Submitter: Jenkins
Branch: master

commit 73a6ad9a13d4b6c2d9efe7d9ec142514fc6904f2
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.

    Change-Id: I4a2410ab80e6018f1b65b2288ae66312eb49cb27
    Depends-On: I34f0b355703fe0133f160afd4e32f2272d41ecaa
    Partial-Bug: #1522503

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

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/283693

summary: - Add support for constraints based jobs for neutron-*aas and -lib
+ Add support for constraints based jobs for neutron-vpnaas
Changed in neutron:
status: In Progress → Fix Released
tags: removed: in-stable-liberty
tags: removed: fwaas lbaas
Revision history for this message
Paul Michali (pcm) wrote :

Just to summarize where this is at, upon completion...

It has been completed on master for neutron-vpnaas. In addition, it uses the new naming (non-constraints named targets) for all jobs using constraints. The decision by Armando, was not to backport this to Liberty, so the review https://review.openstack.org/#/c/283693 is being abandonend.

Neutron, FW, LB, and NLib, have not been converted to use the new (non -constraints named targets), though most (all?) have constraints based targets for master (Mitaka).

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on neutron-vpnaas (stable/liberty)

Change abandoned by Paul Michali (<email address hidden>) on branch: stable/liberty
Review: https://review.openstack.org/283693
Reason: Armando decided not to pursue this at this time. It would require neutron changes to support using constraints w/o the constraints naming. Note: for Liberty, neutron-vpnaas will NOT be using constraints for tests, and will be using the older unconstrained targets.

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix proposed to neutron-vpnaas (master)

Related fix proposed to branch: master
Review: https://review.openstack.org/286182

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Related fix merged to neutron-vpnaas (master)

Reviewed: https://review.openstack.org/286182
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=ad122cf23c296c9dc657a2d92abcb0ff316e8d99
Submitter: Jenkins
Branch: master

commit ad122cf23c296c9dc657a2d92abcb0ff316e8d99
Author: Paul Michali <email address hidden>
Date: Mon Feb 29 12:47:50 2016 -0500

    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.

    Change-Id: I9d11cfd47adae3f49d33e5db8c916ebd983a8f96
    Related-Bug: #1522503

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

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 ...

Read more...

tags: added: in-stable-liberty
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.