"upgrade --expand" alembic migration failure

[Travis Truman]

When installing neutron from source, specifically the versions:

neutron (9.0.0.0b2.dev383)
neutron-fwaas (9.0.0.0b2.dev20)
neutron-lbaas (9.0.0.0b2.dev44)
neutron-lib (0.2.0)
neutron-vpnaas (9.0.0.0b2.dev10)

using pip requirements of:

git+https://git.openstack.org/openstack/neutron@master#egg=neutron
git+https://git.openstack.org/openstack/neutron-fwaas@master#egg=neutron-fwaas
git+https://git.openstack.org/openstack/neutron-lbaas@master#egg=neutron-lbaas
git+https://git.openstack.org/openstack/neutron-vpnaas@master#egg=neutron-vpnaas

And then running:

neutron-db-manage upgrade --expand

We are seeing:

INFO [alembic.runtime.migration] Context impl MySQLImpl.
INFO [alembic.runtime.migration] Will assume non-transactional DDL.
  Running upgrade (expand) for neutron ...
INFO [alembic.runtime.migration] Context impl MySQLImpl.
INFO [alembic.runtime.migration] Will assume non-transactional DDL.
  OK
INFO [alembic.runtime.migration] Context impl MySQLImpl.
INFO [alembic.runtime.migration] Will assume non-transactional DDL.
  Running upgrade (expand) for neutron-fwaas ...
INFO [alembic.runtime.migration] Context impl MySQLImpl.
INFO [alembic.runtime.migration] Will assume non-transactional DDL.
ERROR [alembic.util.messaging] Can't locate revision identified by 'neutron-fwaas-expand'
  FAILED: Can't locate revision identified by 'neutron-fwaas-expand'

The issue is reproducible in the OpenStack-Ansible os_neutron role gate checks:

https://review.openstack.org/#/q/project:openstack/openstack-ansible-os_neutron+status:+open

[Henry Gessau (gessau)]

Affects any external project, not just fwaas.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/338397
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=e8ac4b402ab4966381014b58f660ba651b2a8706
Submitter: Jenkins
Branch: master

commit e8ac4b402ab4966381014b58f660ba651b2a8706
Author: Henry Gessau <email address hidden>
Date: Wed Jul 6 16:51:04 2016 +0000

    Revert "Support unique labels for alembic branches"

    A problem was found with the --expand (and --contract) options, see the bug report. I am reverting this patch so that I can redo it and have one single patch that can be back-ported.

    Closes-Bug: #1599574

    This reverts commit 88359e3fe91b7e8f430b48da30b6d4f1ddf17d62.

    Change-Id: Iebca469c6fec32bac0480be6627ad5e9dedaad9d

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/neutron 9.0.0.0b2 development milestone.