stable ocata still uses master branch of nova/neutron

[Andreas Scheuring]

The tox environment downloads nova/neutron master even when stable/ocata branch is checked out in networking-dpm or nova-dpm. However in this case also the stalbe version of the project should be used!

Steps to reproduce

rm -rf .testrepository/
rm -rf .tox/
git checkout -t stable/ocata
tox -e py27
source .tox/py27/bin/activate
pip freeze | grep neutron
-e git+https://git.openstack.org/openstack/neutron@257341a7a6094bfa56c7564a09ff414d667d4957#egg=neutron

-> Check the commit ID listed here - in the Neutron case it's still the master commit id!

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/444960

[Andreas Scheuring (andreas-scheuring)]

Due to that the following patch fails in networking-dpm: https://review.openstack.org/#/c/443829/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/444960
Committed: https://git.openstack.org/cgit/openstack/networking-dpm/commit/?id=433e44d7cccc494609995ad606ea36718afd0e86
Submitter: Jenkins
Branch: stable/ocata

commit 433e44d7cccc494609995ad606ea36718afd0e86
Author: Andreas Scheuring <email address hidden>
Date: Mon Mar 13 16:50:36 2017 +0100

    Set Neutron stable branch for Ocata release

    The Ocata stable branch still downloads and uses the master branch
    of Neutron in the gate an when running tests with tox locally.

    This patch pins the BRANCH_NAME in tox_install.sh for Neutron to
    stable/ocata.

    Partial-Bug: # 1672438
    Change-Id: I62d6a8bca0fb790de422c7ea57e449cce35ebdf8

[Andreas Scheuring (andreas-scheuring)]

Lowering prio for Neutron as stable/ocata is fixed - however it would be great to come to a general solution where no manual interactions are required....

[Prabhat Ranjan (pranjank)]

Andreas

Is this bug also produced in nova-dpm?

Because my guess is it should not produce in nova-dpm due to this
https://github.com/openstack/nova-dpm/blob/master/tox.ini#L15

But I did not see such things in networking-dpm
https://github.com/openstack/networking-dpm/blob/master/tox.ini#L8-L15

[Andreas Scheuring (andreas-scheuring)]

The point is, that [1] clones nova master. But for our stable/ocata branch it should clone nova stable/ocata - but it still clones master [2].

A temporary fix would be to modifiy the install command of [2] to install stable branch. I'm fine with that. But ideally we would find a way that the branch is detected automatically... haven't found such a way yet for networking-dpm. Also other projects (like networking-ovn) do the hardcoding...

[1] https://github.com/openstack/nova-dpm/blob/master/tox.ini#L15
[2] https://github.com/openstack/nova-dpm/blob/stable/ocata/tox.ini#L15

[Prabhat Ranjan (pranjank)]

nova-powervm did in this way
https://github.com/openstack/nova-powervm/blob/stable/ocata/tox.ini#L14

So I am also thinking to do the same.

[Andreas Scheuring (andreas-scheuring)]

Fine for me. Maybe we should also update the release docs - after creating the new stable branch, such a commit should be made (if the base project already branched out). But let's make this a separate patch...

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/460413

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/460413
Committed: https://git.openstack.org/cgit/openstack/nova-dpm/commit/?id=a77c6cc800cb79705f07a2950ee68c8b05567053
Submitter: Jenkins
Branch: stable/ocata

commit a77c6cc800cb79705f07a2950ee68c8b05567053
Author: Prabhat Ranjan <email address hidden>
Date: Thu Apr 27 11:39:52 2017 +0530

    stable ocata uses master branch of nova

    The tox environment downloads nova master even when stable/ocata
    branch is checked out in nova-dpm. However in this case also
    the stable version of the project should be used!

    This patch also contain one more change

    What another change?
    Ans: In stable/ocata release we did not have "functional"
    test enabled. So when we are trying to fix stable/ocata
    with launchpad bug-1672438 then jenkins were failing because
    we have enabled "functional" test now in pike cycle. So
    inorder to not break jenkins for stable/ocata
    we have added(enabled) "functional" test.

    Closes-Bug: #1672438

    Change-Id: Ibcac0eb71f8881b8fa7884e79af7526048192011
    Signed-off-by: Prabhat Ranjan <email address hidden>