Update test-vars.yml for repositories

Bug #1629284 reported by Andy McCrae
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
OpenStack-Ansible
Fix Released
Low
Deepak Jon

Bug Description

Purely cosmetic, but we decided that we would set the test-vars.yml inside each repositories "tests/test-vars.yml" to be "tests/rolename-overrides.yml". (OSA Meeting 29.09.2016)

This allows us to have overrides per scenario and also reduces confusion with the common test-vars in openstack-ansible-tests/test-vars.yml, by making it clear it is the role overrides.

The change is 2 fold:
* Rename the in repo test-vars.yml to "rolename-overrides.yml".
* Ensure tox.ini references the appropriate filename using -e @tests/rolename-overrides.yml
* Check that in-repo "test-vars.yml" isnt referenced as a var-file include (this often happens on the test-functional-x.yml role, and can be removed as it's included as part of the ansible run using -e @tests/rolename-overrides.yml)

tags: added: low-hanging-fruit
Changed in openstack-ansible:
assignee: nobody → Deepak (deepak.os31)
Changed in openstack-ansible:
status: Confirmed → In Progress
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to openstack-ansible-tests (master)

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

Revision history for this message
Travis Truman (travis-truman) wrote :

A fix for this bug, should include changes to the README.rst in openstack-ansible-tests to note the new format for roles to use when consuming the repo.

Likewise, patches will be required for each of the repos consuming the openstack-ansible-tests repo so they move from doing something like this in their tox.ini (example from os_cinder role):

https://github.com/openstack/openstack-ansible-os_cinder/blob/master/tox.ini#L140

to something like this:

ansible-playbook -i {toxinidir}/tests/inventory \
                     -e "install_test_packages=True" \
                     -e @{toxinidir}/tests/os_cinder-overrides.yml \
                     {toxinidir}/tests/test.yml -vvvv

Likewise, all tests/test-vars.yml in the role repositories will need to be renamed.

Revision history for this message
Travis Truman (travis-truman) wrote :

Also, examples like https://github.com/openstack/openstack-ansible-os_cinder/blob/master/tests/test-cinder-functional.yml#L37 should be removed, since the role override vars are being passed on the command line in tox as Ansible extra vars

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

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

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on openstack-ansible-tests (master)

Change abandoned by Deepak (<email address hidden>) on branch: master
Review: https://review.openstack.org/380489

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

Change abandoned by Deepak (<email address hidden>) on branch: master
Review: https://review.openstack.org/380650

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

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

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

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

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

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

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

Reviewed: https://review.openstack.org/381212
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible-tests/commit/?id=65a1901248e26803bab9ae33727146270964e99f
Submitter: Jenkins
Branch: master

commit 65a1901248e26803bab9ae33727146270964e99f
Author: Deepak <email address hidden>
Date: Mon Oct 3 21:30:45 2016 +0530

    Renamed test-vars.yml to rolename-overrides.yml in README.rst

    Rename of test-vars.yml to rolename-overrides.yml will happen
    of all the repo(rolename) in next patches.

    Change-Id: I3f61aa28fcd741343b19b6be0e9ece6643de743c
    Partial-Bug: #1629284

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to openstack-ansible-tests (stable/newton)

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/381475

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to openstack-ansible-tests (stable/newton)

Reviewed: https://review.openstack.org/381475
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible-tests/commit/?id=2ae7b61caa0072204428c1a4ff5199eb82d5f7a9
Submitter: Jenkins
Branch: stable/newton

commit 2ae7b61caa0072204428c1a4ff5199eb82d5f7a9
Author: Deepak <email address hidden>
Date: Mon Oct 3 21:30:45 2016 +0530

    Renamed test-vars.yml to rolename-overrides.yml in README.rst

    Rename of test-vars.yml to rolename-overrides.yml will happen
    of all the repo(rolename) in next patches.

    Change-Id: I3f61aa28fcd741343b19b6be0e9ece6643de743c
    Partial-Bug: #1629284
    (cherry picked from commit 65a1901248e26803bab9ae33727146270964e99f)

tags: added: in-stable-newton
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to openstack-ansible-os_designate (master)

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

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

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

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

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

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

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

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

Reviewed: https://review.openstack.org/382545
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible-os_horizon/commit/?id=3248bc36d2e473c28dd500e08d4485f9e3fb9354
Submitter: Jenkins
Branch: master

commit 3248bc36d2e473c28dd500e08d4485f9e3fb9354
Author: Deepak <email address hidden>
Date: Tue Oct 4 23:27:13 2016 +0530

    Update test-vars.yml for repositories

    Renamed in os_horizon role repo
    Changed test-vars.yml to os_horizon-overrides.yml
    Removed test-vars.yml

    Change-Id: If3cf9b788fe8c20e2f2dff6fbd6cc2efba0c5efe
    Partial-Bug: #1629284

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

Reviewed: https://review.openstack.org/382020
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible-os_gnocchi/commit/?id=e131d6e468a015e0674f57633531899e5b5468e2
Submitter: Jenkins
Branch: master

commit e131d6e468a015e0674f57633531899e5b5468e2
Author: Deepak <email address hidden>
Date: Tue Oct 4 23:17:02 2016 +0530

    Update test-vars.yml for repositories

    Renamed in os_gnocchi role repo
    Changed test-vars.yml to os_gnocchi-overrides.yml
    Removed the test-vars.yml

    Change-Id: I62ee2338f6bfeee06511a3077e11ed1e84baa66c
    Partial-Bug: #1629284

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

Reviewed: https://review.openstack.org/382027
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible-os_rally/commit/?id=927bcaf5860339dad77615d34f1bf4cad63954b9
Submitter: Jenkins
Branch: master

commit 927bcaf5860339dad77615d34f1bf4cad63954b9
Author: Deepak <email address hidden>
Date: Tue Oct 4 23:44:33 2016 +0530

    Update test-vars.yml for repositories

    Renamed in os_rally role repo
    Changed test-vars.yml to os_rally-overrides.yml
    Removed test-vars.yml

    Change-Id: I73c0a045496f7c36bd00748cb2096d20b5aa7b7b
    Partial-Bug: #1629284

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

Reviewed: https://review.openstack.org/382013
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible-os_designate/commit/?id=0f286a07a95209bc2aebb503a129c585d620ae19
Submitter: Jenkins
Branch: master

commit 0f286a07a95209bc2aebb503a129c585d620ae19
Author: Deepak <email address hidden>
Date: Tue Oct 4 23:07:56 2016 +0530

    Update test-vars.yml for repositories

    Renamed in os_designate role repo
    Changed test-vars.yml to os_designate-overrides.yml
    Removed the test-vars.yml file

    Change-Id: Ic3d5c3094d96cf0026564fcc8407157dfc87cec4
    Partial-Bug: #1629284

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on openstack-ansible-os_ceilometer (master)

Change abandoned by Deepak (<email address hidden>) on branch: master
Review: https://review.openstack.org/381257

Revision history for this message
Andy McCrae (andrew-mccrae) wrote :

Since odyssey4me has updated the central scripts to expect a certain name (eg. os_nova-overrides.yml) we can close this one out!

Changed in openstack-ansible:
status: In Progress → Fix Released
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on openstack-ansible-os_cinder (master)

Change abandoned by Jesse Pretorius (odyssey4me) (<email address hidden>) on branch: master
Review: https://review.openstack.org/381267
Reason: This has been resolved.

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.