| Message ID | 20170704074456.10027-2-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 07/04/17 09:44, Juerg Haefliger wrote: > Derivatives have a different tag format than what the tool reads from > debian/gbp.conf. Specifically, it's Ubuntu-<derivative>-<version> and > not just Ubuntu-<version>. So adjust the expected format accordingly. > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > maintscripts/verify-release-ready | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready > index b22c5aa48639..a17824af39f9 100755 > --- a/maintscripts/verify-release-ready > +++ b/maintscripts/verify-release-ready > @@ -36,7 +36,7 @@ class VerifyReleaseReady(): > s.defaults['verbose'] = False > s.passed = 0 > s.failed = 0 > - s.delimiter = 40 > + s.delimiter = 50 > # add launchpadlib support > s.lp = Launchpad.login_anonymously(s.__class__.__name__, 'production') > s.lp_ubuntu = s.lp.distributions['ubuntu'] > @@ -199,6 +199,17 @@ class VerifyReleaseReady(): > config = ConfigParser.RawConfigParser() > if config.read('debian/gbp.conf'): > expect_tag_format = config.get('buildpackage', 'debian-tag') > + > + # juergh: Derivatives have a different tag format, > + # e.g., Ubuntu-raspi2-<version> > + pkg = cl1['package'] > + if ((pkg != 'linux' and > + not pkg.startswith('linux-lts-') and > + not pkg.startswith('linux-hwe'))): > + deriv = pkg[6:] # strip 'linux-' > + expect_tag_format = expect_tag_format.replace('%(version)', > + deriv + '-%(version)') > + We had a discussion some time ago and we decided that getting the tag pattern from 'debian/gbp.conf' should be deprecated. Thadeu has sent a patch to derive the tag prefix from the package name but it was not handling the case for -hwe and -hwe-edge so it needed some improvements. I think we can merge the two ideas together. > v = version > # Starting with trusty, the lts backports closing commit and the tag > # contain '~<series_version>' (e.g. '~14.04.1') >
diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready index b22c5aa48639..a17824af39f9 100755 --- a/maintscripts/verify-release-ready +++ b/maintscripts/verify-release-ready @@ -36,7 +36,7 @@ class VerifyReleaseReady(): s.defaults['verbose'] = False s.passed = 0 s.failed = 0 - s.delimiter = 40 + s.delimiter = 50 # add launchpadlib support s.lp = Launchpad.login_anonymously(s.__class__.__name__, 'production') s.lp_ubuntu = s.lp.distributions['ubuntu'] @@ -199,6 +199,17 @@ class VerifyReleaseReady(): config = ConfigParser.RawConfigParser() if config.read('debian/gbp.conf'): expect_tag_format = config.get('buildpackage', 'debian-tag') + + # juergh: Derivatives have a different tag format, + # e.g., Ubuntu-raspi2-<version> + pkg = cl1['package'] + if ((pkg != 'linux' and + not pkg.startswith('linux-lts-') and + not pkg.startswith('linux-hwe'))): + deriv = pkg[6:] # strip 'linux-' + expect_tag_format = expect_tag_format.replace('%(version)', + deriv + '-%(version)') + v = version # Starting with trusty, the lts backports closing commit and the tag # contain '~<series_version>' (e.g. '~14.04.1')
Derivatives have a different tag format than what the tool reads from debian/gbp.conf. Specifically, it's Ubuntu-<derivative>-<version> and not just Ubuntu-<version>. So adjust the expected format accordingly. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- maintscripts/verify-release-ready | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)