From patchwork Mon Mar 27 14:34:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 743855 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vsGkb0YJRz9s7C; Tue, 28 Mar 2017 01:34:31 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1csVj1-0007iM-Dd; Mon, 27 Mar 2017 14:34:27 +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 1csVix-0007h8-1E for kernel-team@lists.ubuntu.com; Mon, 27 Mar 2017 14:34:23 +0000 Received: from 1.general.cascardo.us.vpn ([10.172.70.58] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1csViw-0006g4-Ak for kernel-team@lists.ubuntu.com; Mon, 27 Mar 2017 14:34:22 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [kteam-tools][PATCH] swm: remove block-proposed tags when all is ready Date: Mon, 27 Mar 2017 11:34:16 -0300 Message-Id: <20170327143416.17514-1-cascardo@canonical.com> X-Mailer: git-send-email 2.9.3 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 britney only checks for the tags, not the tasks, and block-proposed will block it. So, block-proposed tags need to be removed whenever we are ready to promote the packages. We have the kernel-block tag as a tool to stop the promotions. Remove the tags whenever we set any of the release, security or updates promotion to Confirmed or further. Signed-off-by: Thadeu Lima de Souza Cascardo --- stable/wfl/wft/promote_to_release.py | 8 ++++---- stable/wfl/wft/promote_to_security.py | 8 ++++---- stable/wfl/wft/promote_to_updates.py | 8 ++++---- stable/wfl/wft/promoter.py | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/stable/wfl/wft/promote_to_release.py b/stable/wfl/wft/promote_to_release.py index b064acd..03856ee 100644 --- a/stable/wfl/wft/promote_to_release.py +++ b/stable/wfl/wft/promote_to_release.py @@ -36,10 +36,6 @@ class PromoteToRelease(Promoter): if not s._testing_completed(): break - if s._block_proposed(): - cinfo(' A block-proposed tag exists on this tracking bug', 'yellow') - break - if s._kernel_block(): cinfo(' A kernel-block tag exists on this tracking bug', 'yellow') break @@ -61,6 +57,10 @@ class PromoteToRelease(Promoter): while True: + if s._block_proposed(): + s._remove_block_proposed() + cinfo(' Removing block-proposed tag on this tracking bug', 'yellow') + # Check if packages were copied to the right pocket->component # if not s.bug.packages_released: diff --git a/stable/wfl/wft/promote_to_security.py b/stable/wfl/wft/promote_to_security.py index 5490e1d..d26f622 100644 --- a/stable/wfl/wft/promote_to_security.py +++ b/stable/wfl/wft/promote_to_security.py @@ -58,10 +58,6 @@ class PromoteToSecurity(Promoter): if not s._testing_completed(): break - if s._block_proposed(): - cinfo(' A block-proposed tag exists on this tracking bug', 'yellow') - break - if s._kernel_block(): cinfo(' A kernel-block tag exists on this tracking bug', 'yellow') break @@ -81,6 +77,10 @@ class PromoteToSecurity(Promoter): while True: + if s._block_proposed(): + s._remove_block_proposed() + cinfo(' Removing block-proposed tag on this tracking bug', 'yellow') + # Check if packages were copied to the right pocket->component # if not s.bug.packages_released_to_security: diff --git a/stable/wfl/wft/promote_to_updates.py b/stable/wfl/wft/promote_to_updates.py index 90ac35d..4471f43 100644 --- a/stable/wfl/wft/promote_to_updates.py +++ b/stable/wfl/wft/promote_to_updates.py @@ -50,10 +50,6 @@ class PromoteToUpdates(Promoter): if not s._testing_completed(): break - if s._block_proposed(): - cinfo(' A block-proposed tag exists on this tracking bug', 'yellow') - break - if s._kernel_block(): cinfo(' A kernel-block tag exists on this tracking bug', 'yellow') break @@ -75,6 +71,10 @@ class PromoteToUpdates(Promoter): # Check if packages were copied to the right pocket->component # + if s._block_proposed(): + s._remove_block_proposed() + cinfo(' Removing block-proposed tag on this tracking bug', 'yellow') + if not s.bug.packages_released: cinfo(' packages have not been released', 'yellow') break diff --git a/stable/wfl/wft/promoter.py b/stable/wfl/wft/promoter.py index 646e413..ab84c07 100644 --- a/stable/wfl/wft/promoter.py +++ b/stable/wfl/wft/promoter.py @@ -36,6 +36,23 @@ class Promoter(TaskHandler): cleave(s.__class__.__name__ + '.block_proposed (%s)' % retval) return retval + def _remove_block_proposed(s): + ''' + Remove 'block-proposed' tags in order to signal britney. + ''' + center(s.__class__.__name__ + '.remove_block_proposed') + + try: + series_tag = 'block-proposed-%s' % s.bug.series + if series_tag in s.bug.lpbug.tags: + s.bug.lpbug.tags.remove(series_tag) + if 'block-proposed' in s.bug.lpbug.tags: + s.bug.lpbug.tags.remove('block-proposed') + except: + pass + + cleave(s.__class__.__name__ + '.remove_block_proposed') + def _security_signoff_verified(s): ''' Check if the security-signoff task has been set to 'Fix Released'. Development