NACK: [kteam-tools][PATCH] stable: remove hwe flag for sru

Po-Hsu Lin po-hsu.lin at canonical.com
Tue Aug 29 03:12:14 UTC 2017


OK, I will send v2 for that.
Thanks

On Mon, Aug 28, 2017 at 6:00 PM, Kleber Souza <kleber.souza at canonical.com> wrote:
> On 08/28/17 08:28, Po-Hsu Lin wrote:
>> Remove the hwe flag in the test request since we are dealing with this by
>> parsing the kernel version and the package name.
>>
>> Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
>> ---
>>  stable/msgq-publish-sample | 1 -
>>  stable/wfl/bug.py          | 6 ------
>>  stable/wfl/package.py      | 4 ----
>>  3 files changed, 11 deletions(-)
>>
>> diff --git a/stable/msgq-publish-sample b/stable/msgq-publish-sample
>> index b3badabc..3f460500 100755
>> --- a/stable/msgq-publish-sample
>> +++ b/stable/msgq-publish-sample
>> @@ -44,7 +44,6 @@ examples:
>>              "date"           : "2015-01-26 20:09:48.928018",
>>              "series-name"    : "trusty",
>>              "series-version" : "10.04",
>> -            "hwe"            : False,
>>              "bug id"         : 1410384,
>>              "url"            : "https://bugs.launchpad.net/bugs/1410384",
>>              "version"        : "3.13.0-45.74",
>> diff --git a/stable/wfl/bug.py b/stable/wfl/bug.py
>> index 73fe3fb1..a7fb7954 100644
>> --- a/stable/wfl/bug.py
>> +++ b/stable/wfl/bug.py
>> @@ -171,11 +171,6 @@ class WorkflowBug():
>>              else:
>>                  cinfo('                 derivative: no', 'blue')
>>
>> -            if s.__package.hwe:
>> -                cinfo('                        hwe: yes', 'blue')
>> -                cinfo('                 hwe series: %s' % (s.__package.test_series), 'blue')
>> -            else:
>> -                cinfo('                        hwe: no', 'blue')
>>              cinfo('               routing_mode: %s' % (s.__package.routing_mode), 'blue')
>>              cinfo('              test_flavours: %s' % (s.test_flavours()), 'blue')
>>              cinfo('')
>> @@ -812,7 +807,6 @@ class WorkflowBug():
>>              "date"           : str(datetime.utcnow()),
>>              "series-name"    : s.__package.test_series,
>>              "series-version" : s.__package.test_series_version,
>> -            "hwe"            : s.__package.hwe,
>>              "kernel-version" : s.pkg_version,
>>              "package"        : s.pkg_name,
>>              "flavour"        : flavour,
>> diff --git a/stable/wfl/package.py b/stable/wfl/package.py
>> index 441de240..5ff759c0 100644
>> --- a/stable/wfl/package.py
>> +++ b/stable/wfl/package.py
>> @@ -118,7 +118,6 @@ class Package():
>>
>>          #info('     Extract package info\n')
>>          setattr(s, 'valid', False)
>> -        setattr(s, 'hwe', False)
>>          m = ver_rc.search(txt)
>>          if m is not None:
>>              matched = True
>> @@ -132,9 +131,6 @@ class Package():
>>              setattr(s, 'kernel', m.group(2))
>>              setattr(s, 'abi', m.group(4))
>>
>> -            if m.group(6):
>> -                s.hwe = True
>> -
>>              # Work out what series this package is published in...
>>              series_tag_entry = None
>>              for tag in lpbug.tags:
>>
>
> Removing the hwe property from the TB also makes sense to me.
>
> I think we can also remove the following comments, since the tag will
> not be present anymore:
>  diff --git a/stable/wfl/package.py b/stable/wfl/package.py
> index 441de240..f67055e6 100644
> --- a/stable/wfl/package.py
> +++ b/stable/wfl/package.py
> @@ -140,8 +140,6 @@ class Package():
>              for tag in lpbug.tags:
>                  if tag in s.ubuntu.index_by_series_name:
>                      series_tag_entry = s.ubuntu.index_by_series_name[tag]
> -            # XXX: Bodge: we pass the source series to the test
> -            # infrastructure and a hwe flag to tell it that is wrong ?
>              test_tag_entry = series_tag_entry
>              if ('backport-packages' in series_tag_entry and
>                  s.name in series_tag_entry['backport-packages']):
>





More information about the kernel-team mailing list