From patchwork Tue Aug 29 03:13:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 806923 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3xhDHz74Yvz9sNr; Tue, 29 Aug 2017 13:14:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dmWyb-0000Ih-AS; Tue, 29 Aug 2017 03:14:05 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dmWyW-0000IP-84 for kernel-team@lists.ubuntu.com; Tue, 29 Aug 2017 03:14:00 +0000 Received: from mail-pg0-f69.google.com ([74.125.83.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1dmWyV-000187-RG for kernel-team@lists.ubuntu.com; Tue, 29 Aug 2017 03:13:59 +0000 Received: by mail-pg0-f69.google.com with SMTP id a186so3848182pge.5 for ; Mon, 28 Aug 2017 20:13:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=pkELgtrzqYJPGghK41K3OBFDwVQur3Bxkko+PBJ1ChY=; b=QsqoHqnKTexkCagM+V4pFFKTY3ROvUhjchJe+SlX13VebTNyjUOdzzABHhd3HNYhn9 BwetCOWqIAo4hfYDk7E8OQWf50vLusz2tOnR2Idn9CmhJ2VJQyMGjfLJlPlvXffqBfua H5iMNOd/jb21R/4Qi6w/TrQINxnhQ9N3o+bLHS+a9HTmcltJ/qLRjRn2/PRFJnhdasxK 4e2AJWJ77e5hg/pEVGasALOKlhokXdhMyvyQMlY5r0AOOG+xEBTJdRXe2R4CoqiR7uwU 2AyG4C77ydZMFfocU8nxXemvNN9DzTYppm0lbGBjiWzSdeH8+cHpncSpXm2EjUxx81hb Lbkw== X-Gm-Message-State: AHYfb5i4Ul6dqD/n06+rMe6VaasSi5fo+dm2PJGexRGlItYGgR1zrRmF To8t4hLEvHNcHdUi97NJiGC3gRy/T3d7hM3GqFpKti+llqF5AxeLmp4TCWrMdzAchsDi6zUhwcz IxXpf9dHaP0ncP8Ty3WoGLR1GujK4x663 X-Received: by 10.98.160.12 with SMTP id r12mr2698288pfe.124.1503976438414; Mon, 28 Aug 2017 20:13:58 -0700 (PDT) X-Received: by 10.98.160.12 with SMTP id r12mr2698282pfe.124.1503976438193; Mon, 28 Aug 2017 20:13:58 -0700 (PDT) Received: from localhost.localdomain ([175.41.48.77]) by smtp.gmail.com with ESMTPSA id g90sm2463766pfd.102.2017.08.28.20.13.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 20:13:57 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCHv2] stable: remove hwe flag for sru Date: Tue, 29 Aug 2017 11:13:35 +0800 Message-Id: <20170829031335.1577-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.11.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 Acked-by: Kleber Sacilotto de Souza Acked-by: Andy Whitcroft --- stable/msgq-publish-sample | 1 - stable/wfl/bug.py | 6 ------ stable/wfl/package.py | 6 ------ 3 files changed, 13 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..89b9dc60 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,16 +131,11 @@ 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: 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']):