stable/juno branches are versioned incorrectly

Bug #1481877 reported by Adam Gandelman
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
akanda
Fix Committed
Critical
Sean Roberts

Bug Description

We created stable/juno and stable/kilo at the same time. First branching stable/kilo, and then brancing stable/juno from there. As a result, our stable/juno branches all contain version 2015.1.1 in setup.cfg. Attempting to change this to an appropriate 2015.2 version results in PBR errors because setup.cfg's version will be less than the last greatest git tag.

To make matters worse, some of the repositories' stable banches haven't moved at all and when sarob tagged master's 2015.2.0b1, the tag points to the HEAD of both master and stable/juno. ie, akanda-horizon's stable/juno's HEAD points to the same hash as 2015.2.0b1 tag, but its setup.cfg reads 2015.1.1 and is effectively wedged.

Sean Roberts (sarob)
Changed in akanda:
importance: Undecided → Critical
assignee: nobody → Sean Roberts (sarob)
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to akanda-rug (stable/juno)

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/217801

Sean Roberts (sarob)
Changed in akanda:
milestone: none → liberty-rc1
status: New → In Progress
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to akanda-appliance (stable/juno)

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/217808

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to akanda-horizon (stable/juno)

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/217812

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

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/217814

Sean Roberts (sarob)
no longer affects: akanda/kilo
Sean Roberts (sarob)
tags: added: akanda-ci
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to akanda-rug (stable/juno)

Reviewed: https://review.openstack.org/217801
Committed: https://git.openstack.org/cgit/stackforge/akanda-rug/commit/?id=7732d54ce7fe3303b6927e7f0f316650c04849b5
Submitter: Jenkins
Branch: stable/juno

commit 7732d54ce7fe3303b6927e7f0f316650c04849b5
Author: Sean Roberts <email address hidden>
Date: Thu Aug 27 09:59:57 2015 -0700

    fix incorrect versioning

    stable/kilo was backported to stable/juno and the
    pbr versioning was not adjusted to relect stable/juno

    Change-Id: If669c65f4d789b70f52c3cb2e4db10b1601c9166
    Partial-Bug: #1481877

tags: added: in-stable-juno
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to akanda-horizon (stable/kilo)

Fix proposed to branch: stable/kilo
Review: https://review.openstack.org/222734

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Change abandoned on akanda-horizon (stable/kilo)

Change abandoned by Sean Roberts (<email address hidden>) on branch: stable/kilo
Review: https://review.openstack.org/222734

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

Reviewed: https://review.openstack.org/217814
Committed: https://git.openstack.org/cgit/stackforge/akanda-neutron/commit/?id=2ce7b878885f285775dd1c29e987f8bc8958b296
Submitter: Jenkins
Branch: stable/juno

commit 2ce7b878885f285775dd1c29e987f8bc8958b296
Author: Sean Roberts <email address hidden>
Date: Thu Aug 27 10:25:04 2015 -0700

    fix incorrect versioning

    stable/kilo was backported to stable/juno and the
    pbr versioning was not adjusted to reflect stable/juno

    Change-Id: Ifb8a4482530cc311b66aba029791b43398cd9741
    Partial-Bug: #1481877

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to akanda-appliance (stable/juno)

Reviewed: https://review.openstack.org/217808
Committed: https://git.openstack.org/cgit/stackforge/akanda-appliance/commit/?id=794aecde2da1fcb230641d41e5dfd2e6bd36e348
Submitter: Jenkins
Branch: stable/juno

commit 794aecde2da1fcb230641d41e5dfd2e6bd36e348
Author: Sean Roberts <email address hidden>
Date: Thu Aug 27 10:15:18 2015 -0700

    fix incorrect versioning

    stable/kilo was backported to stable/juno and the
    pbr versioning was not adjusted to reflect stable/juno

    Change-Id: If5ff1c2caebe8aa24e9b7bd79619cf925ed39312
    Partial-Bug: #1481877

Changed in akanda:
milestone: liberty-rc1 → none
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to akanda-horizon (stable/juno)

Reviewed: https://review.openstack.org/217812
Committed: https://git.openstack.org/cgit/stackforge/akanda-horizon/commit/?id=d0f933f83b895125e22ad2ad9b7e372ef93d0fe4
Submitter: Jenkins
Branch: stable/juno

commit d0f933f83b895125e22ad2ad9b7e372ef93d0fe4
Author: Sean Roberts <email address hidden>
Date: Thu Aug 27 10:23:00 2015 -0700

    fix incorrect versioning

    stable/kilo was backported to stable/juno and the
    pbr versioning was not adjusted to reflect stable/juno

    Change-Id: I045769cd06c2a856e1fdfbd6133e1435118c9e00
    Partial-Bug: #1481877

Sean Roberts (sarob)
Changed in akanda:
status: In Progress → Fix Committed
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.