wallaby python3-tripleoclient is later version than current-tripleo-dev python3-tripleoclient

[Harald Jensås]

(wallaby current) installs:
  python3-tripleoclient-16.2.1-0.20210603174615.c5b1e0c.el8.noarch

(current-tripleo-dev) installs:
  python3-tripleoclient-16.1.0-0.20210606213423.c4261c4.el8.noarch

DNF won't upgrade tripleoclient after switching to current-tripleo-dev repos.
Upgrade is not working.

[Harald Jensås (harald-jensas)]

There are issues with other packages as well:

openstack-tripleo-heat-templates:
  14.1.2-0.20210608214149.902594d.el8 <- Wallaby
  14.1.1-0.20210610140727.8b0dd8a.el8 <- Master

git show 902594d
commit 902594d7765573ba8f63da1fb027e79c01d905d8 (origin/stable/wallaby, gerrit/stable/wallaby)

git show 8b0dd8a
commit 8b0dd8ad780412d12773bcf8b250c4dee566c763 (gerrit/master)

[Harald Jensås (harald-jensas)]

Filed RDO Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1970579

[Alan Pevec (apevec)]

on master: $ python ./setup.py --version
16.1.0.dev118
stable/wallaby: 16.2.2.dev6
That's what DLRN is taking when computing RPM versions, upstream needs to bump version on master, there were no tags on master since branching.
You can do that w/o tags by pushing a commit message with sem-ver: api-break to bump major using PBR. Master needs major bump since minor was bumped on stable/wallaby.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/python-tripleoclient/+/795893

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/795894

[Alan Pevec (apevec)]

Example commit msg (could empty, PBR just needs sem-ver: keyword)

    Bump major on master

    to win over last stable/wallaby tags
    sem-ver: api-break

$ python ./setup.py --version
17.0.0.dev119

[Sandeep Yadav (sandeepyadav93)]

Do we need similar change for tripleo-ansible also:-

* tripleo-ansible:-

Master
~~~
$ python3 setup.py --version
3.2.0.dev98
~~~

Wallaby
~~~
$ python3 setup.py --version
3.1.2.dev34
~~~

* tripleo-common looks okay

Master:-
~~~
$ python3 setup.py --version
16.1.0.dev38
~~~

Wallaby:-
~~~
$ python3 setup.py --version
15.2.1
~~~

[Marios Andreou (marios-b)]

I just went reading at https://docs.openstack.org/pbr/3.1.1/index.html#version to understand the relevance of the Sem-Ver: api-break in the commit message.

Mainly I am concerned that this will then clash with making tags in the future. For example, when we try to actually tag a xena release as 17.0.0 will there be a conflict with the version?

I think it would be better to just push a release for xena and tag all the repos with a major bump. Otherwise it will be confusing trying to manage the versions in two ways like this.

[Harald Jensås (harald-jensas)]

The way I read https://docs.openstack.org/pbr/3.1.1/index.html#version, is that we can create a tag 17.0.0 and that will be the version. When there is a tag it won't go back the log looking for any commit setting Sem-Ver prior to the tag. It will only look for a Sem-Ver from master and backward to the previous tag.

The strange thing is that for master python-tripleoclient we get:

  $ python3 ./setup.py --version
  16.1.0.dev118

Yet, there is a 16.2 tag. According to https://docs.openstack.org/pbr/3.1.1/index.html#version:
  """ If the currently checked out revision is not tagged, then we take the last tagged version number and increment it to get a minimum target version. """

  $ git tag -l "16.*"
  16.0.0
  16.1.0
  16.2.0
  16.2.1

So what I don't understand is, how can we end up with 16.1.0.dev118, and not 16.2.1.devXXX?

Sem-Ver: api-break has been used previously in changes:
  I23e7b43569b7aefddedcd11ea6ce2d2730b9aa0e - python-tripleoclient
  Ic47869c96217269806daac9c3c888603e4e5d00a - tripleo-heat-templates

Sem-Ver is also used by OpenStack Release Bot:
 Change: I03e12e03b97d0e526a48435c4b788e506284b973

Looking at the tags, they are also created by OpenStack Release Bot.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.opendev.org/c/openstack/puppet-tripleo/+/795938

[yatin (yatinkarel)]

<< Mainly I am concerned that this will then clash with making tags in the future. For example, when we try to actually tag a xena release as 17.0.0 will there be a conflict with the version?

No there will be no version conflict.

<< I think it would be better to just push a release for xena and tag all the repos with a major bump. Otherwise it will be confusing trying to manage the versions in two ways like this.

Just for clearing this version issue new tags shouldn't be needed.
Ideally same-ver change should be done at start of the cycle when stable/wallaby/xena is cut. Since this issue can appear in every release may be better to discuss with other members and come to a process change so we can avoid such issues.

[Marios Andreou (marios-b)]

ACK thank you for the comment @ykarel, I will remove my -2 from Harald semver: patches after I comment here.

However I still think we should tag if nothing else for consistency, we already tagged tripleo-common there https://review.opendev.org/c/openstack/releases/+/788293 (which is why in https://bugs.launchpad.net/tripleo/+bug/1931223/comments/7 tripleo-common 'is ok')

I've posted the bump for the rest of the repos at https://review.opendev.org/c/openstack/releases/+/795948 and it depends on https://review.opendev.org/c/openstack/puppet-tripleo/+/795938

[Marios Andreou (marios-b)]

@Harald regarding your comment https://bugs.launchpad.net/tripleo/+bug/1931223/comments/9 I had the same question/confusion

The reason is that for *master* branch, the last tag currently on it, is the one we made when we branched wallaby. From that point on, all the tags have been specifically on *wallaby*.

So for example python-tripleoclient the wallaby branch was created on at 16.0.0 https://github.com/openstack/releases/blob/156b6df7b599297a5c8abc5c49481b2c40b3b304/deliverables/wallaby/python-tripleoclient.yaml#L32

That is 'common' point between master and wallaby so it is the only tag on master currently. SO pbr takes it and increments to 16.1.0

[OpenStack Infra (hudson-openstack)]

Change abandoned by "Harald Jensås <email address hidden>" on branch: master
Review: https://review.opendev.org/c/openstack/python-tripleoclient/+/795893
Reason: https://review.opendev.org/c/openstack/releases/+/795948

[OpenStack Infra (hudson-openstack)]

Change abandoned by "Harald Jensås <email address hidden>" on branch: master
Review: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/795894
Reason: https://review.opendev.org/c/openstack/releases/+/795948

[Harald Jensås (harald-jensas)]

I abandoned the two patches setting sem-ver: api-break.

This patch will create tag's in all tripleo repo master branches: https://review.opendev.org/c/openstack/releases/+/795948 - and should thus fix this issue.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/c/openstack/puppet-tripleo/+/795938
Committed: https://opendev.org/openstack/puppet-tripleo/commit/afd848aebd4992df5c6d1dad01ddd60e45634374
Submitter: "Zuul (22348)"
Branch: master

commit afd848aebd4992df5c6d1dad01ddd60e45634374
Author: Marios Andreou <email address hidden>
Date: Fri Jun 11 10:27:47 2021 +0300

    Bump major for metadata.json to mark the X cycle

    This is needed to make a new tag on X for related-bug at [1]

    [1] If80932ebd102d4bcda70256f4cf82cb5267939da
    Related-Bug: 1931223
    Change-Id: I9f3677fded010fcd659c154e5ec6a6a156e3fec3

[Harald Jensås (harald-jensas)]

If80932ebd102d4bcda70256f4cf82cb5267939da (https://review.opendev.org/c/openstack/releases/+/795948) has merged, this should can be closed.