Merge lp:~chad.smith/lp2kanban/merge-kanban-cross-team-fixes into lp:lp2kanban

[Chad Smith]

The cross-team jenkins job (https://ci.lscape.net/job/kanban-cross-team/) is already running on lp:lp2kanban and it relies on configuration files maas.ini, juju.ini, charms.ini and server.ini which are already added to our lp:~landscape/landscape/lp2kanban-configs repo.

There are some missing config option changes needed to support those ini files which David originally made to the lp2kanban fork at lp:~landscape/lp2kanban/cross-team.

This cross team changes add the following support for configuration options:

**new_lanes**: the lane(s) into which cards at "New", "Confirmed" "Triaged" or "Incomplete"
                    bug statuses are moved
**done_lanes**: DROPPED in favor of the more granular done_fix_lanes and done_nofix_lanes

**done_fix_lanes**: the lane(s) into which bugs in "Fix Released" status are moved

**done_nofix_lanes**: the lane(s) into which bugs in "Opinion", "Invalid", "Won't Fix", "Expired"
                    bug statuses are move

This branch also changes lp2kanban to rename todo_lane to new_lane as they have the same intended behavior.

To support testing this branch, rev 9 of lp:~landscape/landscape/lp2kanban-configs adds these new lane config options to our kanban-sync's "sync.ini" file so existing lp2kanban can continue to use the old todo_lane and done_lane.

Unit tests were added to cover the changes to better describe and test new behavior.

To test:

# Either make this project
make configs
make credentials
make
make check
./bin/py ./src/lp2kanban/bugs2cards.py -c configs/sync.ini -b "Landscape 2016"

# Or Hijack jenkins kanban sync job and point the Repository URL to lp:~chad.smith/lp2kanban/merge-kanban-cross-team-fixes instead of lp:lp2kanban

https://ci.lscape.net/job/kanban-sync/configure

# Or stop the jenkins kanban-sync job and patch the existing checkout (which is refreshed each run anyway)
ssh <email address hidden>; sudo -u jenkins bash; cd /var/lib/jenkins/workspaces/kanban-sync; bzr merge lp:~chad.smith/lp2kanban/merge-kanban-cross-team-fixes; ./bin/py -c configs/sync.ini -b "Landscape 2016"

[Benji York (benji)]

This branch looks good.

review: Approve

[Данило Шеган (danilo)]

Looks good, thanks!

Make sure it still works with cross-team job, too :)

review: Approve

[lp:~chad.smith/lp2kanban/merge-kanban-cross-team-fixes]

142. By Chad Smith on 2016-04-13

drop unused run.sh

143. By Chad Smith on 2016-04-13

revert Makefile change

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2016-04-13 15:47:22 +0000
@@ -0,0 +1,57 @@
+# Copyright 2005-2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+PYTHON=python
+WD:=$(shell pwd)
+PY=$(WD)/bin/py
+
+BUILDOUT_CFG=buildout.cfg
+
+CONFIGS_BRANCH=lp:~landscape/landscape/lp2kanban-configs
+
+# Do not add bin/buildout to this list.
+# It is impossible to get buildout to tell us all the files it would
+# build, since each egg's setup.py doesn't tell us that information.
+#
+# NB: It's important BUILDOUT_BIN only mentions things genuinely produced by
+# buildout.
+BUILDOUT_BIN = $(PY) bin/tags bin/test
+
+default: check
+
+
+download-cache:
+	mkdir download-cache
+
+
+bin/buildout: download-cache
+	$(PYTHON) bootstrap.py -v 1.7.1 -f eggs -c buildout.cfg
+	touch --no-create $@
+
+
+$(PY): bin/buildout $(BUILDOUT_CFG) setup.py
+	./bin/buildout -c $(BUILDOUT_CFG)
+
+
+$(subst $(PY),,$(BUILDOUT_BIN)): $(PY)
+
+
+needs-xdg-utils:
+	@xdg-open --help > /dev/null \
+            || (echo "missing dependency: please install xdg-utils"; false)
+
+
+credentials: needs-xdg-utils create_creds.py
+	./create_creds.py
+
+check: bin/test
+	./bin/test -vv
+
+configs:
+	@if [ -d configs ]; then \
+	  (cd configs && bzr pull --overwrite $(CONFIGS_BRANCH)); \
+	else \
+	  bzr branch $(CONFIGS_BRANCH) configs; \
+	fi
+
+.PHONY: check default configs credentials needs-xdg-utils

=== renamed file 'Makefile' => 'Makefile.moved'
=== removed file 'run.sh'
--- run.sh	2016-04-11 21:48:37 +0000
+++ run.sh	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-LOGFILE="logs/${1}-`date '+%Y-%m-%d'`.log"
-LOCKFILE="$HOME/lp2kanban/run-$1.lock"
-exit_status=0
-export https_proxy=http://squid.external:3128
-
-cd $HOME/lp2kanban
-echo -n "START " >> $LOGFILE
-date "+%c" >> $LOGFILE
-lockfile -10 -r 4 $LOCKFILE
-if [ "$?" -eq 0 ]; then
-    bin/py src/lp2kanban/bugs2cards.py -c configs/${1}.ini 2>&1 >> $LOGFILE
-    exit_status=$?
-    rm -f $LOCKFILE
-else
-    echo "Failed to grab lockfile $LOCKFILE" >> $LOGFILE
-    exit_status=1
-fi
-echo -n "END " >> $LOGFILE; date "+%c" >> $LOGFILE
-exit $?

=== modified file 'setup.py'
--- setup.py	2016-04-11 21:48:37 +0000
+++ setup.py	2016-04-13 15:47:22 +0000
@@ -17,6 +17,7 @@
         'lazr.uri',
         'requests',
         'setuptools',
+        'simplejson',
         'testtools',
         ],
     )

=== modified file 'src/lp2kanban/bugs2cards.py'
--- src/lp2kanban/bugs2cards.py	2016-04-11 21:51:29 +0000
+++ src/lp2kanban/bugs2cards.py	2016-04-13 15:47:22 +0000
@@ -134,13 +134,13 @@
             self.lp_to_group.update(parse_groups_config(groups_config))
 
         self.feature_lanes = {}
-        todo_lane =  config.get("todo_lane")
-        if not todo_lane:
+        new_lane =  config.get("new_lanes")
+        if not new_lane:
             return
-        if "${group}" in todo_lane:
+        if "${group}" in new_lane:
             # Build squad feature lanes to allow for squad-$group tags
             for group in set(self.lp_to_group.values()):
-                lane_path = todo_lane.replace("${group}", group)
+                lane_path = new_lane.replace("${group}", group)
                 lane = board.getLaneByPath(lane_path)
                 group_tag = "squad-%s" % group.lower().replace(" ","-")
                 self.feature_lanes[group_tag] = lane
@@ -148,19 +148,19 @@
             if not card.tags:
                 print ("Info: feature card '%s' has no tags. New bugs tagged "
                        "for this feature will not be moved to the proper "
-                       "todo_lane." % card.title)
+                       "new_lane." % card.title)
                 continue
-            if "${group}" in todo_lane:
+            if "${group}" in new_lane:
                 lp_user = self.kanban_to_lp.get(card.assigned_user_id)
                 if not lp_user:
                     print ("Info: feature card '%s' has no assigned user. New "
                            "bugs tagged for this feature will not be moved to "
-                           "the proper todo_lane." % card.title)
+                           "the proper new_lane." % card.title)
                     continue
-                lane_path = todo_lane.replace(
+                lane_path = new_lane.replace(
                     "${group}", self.lp_to_group[lp_user.name])
             else:
-                lane_path = todo_lane
+                lane_path = new_lane
             for tag in card.tags.split(","):
                 if tag != "no-sync":
                     self.feature_lanes[tag.strip()] = board.getLaneByPath(
@@ -382,41 +382,53 @@
     return enabled and active
 
 
+NEW_BUG_STATUSES = [
+    "New", "Confirmed", "Triaged", "Incomplete"
+]
+
 NOOP_BUG_STATUSES = [
-    "New", "Incomplete", "Confirmed", "Triaged",
 ]
 IN_PROGRESS_BUG_STATUSES = [
     "In Progress", "Fix Committed",
     ]
-DONE_BUG_STATUSES = [
-    "Fix Released", "Opinion", "Invalid", "Won't Fix", "Expired",
+DONE_FIX_BUG_STATUSES = [
+    "Fix Released",
 ]
+DONE_NOFIX_BUG_STATUSES = [
+    "Opinion", "Invalid", "Won't Fix", "Expired"]
+
 ORDERED_BUG_STATUSES = (
-    NOOP_BUG_STATUSES + IN_PROGRESS_BUG_STATUSES + DONE_BUG_STATUSES)
+    NEW_BUG_STATUSES + NOOP_BUG_STATUSES + IN_PROGRESS_BUG_STATUSES +
+    DONE_FIX_BUG_STATUSES + DONE_NOFIX_BUG_STATUSES)
 
 
 class CardStatus:
     """Card is consider to be in only one of these statuses."""
-    CODING = 0
-    REVIEW = 1
-    LANDING = 2
-    QA = 3
-    DEPLOY = 4
-    DOWNTIME_DEPLOY = 5
-    DONE = 6
+    NEW = 0
+    CODING = 1
+    REVIEW = 2
+    LANDING = 3
+    QA = 4
+    DEPLOY = 5
+    DOWNTIME_DEPLOY = 6
+    DONE_FIX = 7
+    DONE_NOFIX = 8
 
 
 # Configuration variables for individual card statuses.
 ConfigOptionByStatus = {
+    CardStatus.NEW: 'new_lanes',
     CardStatus.CODING: 'coding_lanes',
     CardStatus.REVIEW: 'review_lanes',
     CardStatus.LANDING: 'landing_lanes',
     CardStatus.QA: 'qa_lanes',
     CardStatus.DEPLOY: 'deploy_lanes',
     CardStatus.DOWNTIME_DEPLOY: 'downtime_deploy_lanes',
-    CardStatus.DONE: 'done_lanes',
+    CardStatus.DONE_FIX: 'done_fix_lanes',
+    CardStatus.DONE_NOFIX: 'done_nofix_lanes',
     }
 
+
 def get_new_bugs(board, bugs):
     """Return the bugs that aren't already in the board."""
     existing_bugs = set()
@@ -450,7 +462,9 @@
             branch_card_status = CardStatus.LANDING
         if bug_status is None:
             return branch_card_status
-    if bug_status in IN_PROGRESS_BUG_STATUSES:
+    if bug_status in NEW_BUG_STATUSES:
+        status = CardStatus.NEW
+    elif bug_status in IN_PROGRESS_BUG_STATUSES:
         status = CardStatus.CODING
         if branch_info.status == 'Merged':
             if bug_status == 'Fix Committed':
@@ -465,8 +479,10 @@
                 status = CardStatus.LANDING
         elif branch_card_status:
             return branch_card_status
-    elif bug_status in DONE_BUG_STATUSES:
-        status = CardStatus.DONE
+    elif bug_status in DONE_FIX_BUG_STATUSES:
+        status = CardStatus.DONE_FIX
+    elif bug_status in DONE_NOFIX_BUG_STATUSES:
+        status = CardStatus.DONE_NOFIX
     return status
 
 
@@ -529,6 +545,7 @@
     If a bug is tagged with the given tag, a new card will be created in
     the board and the tag will be removed from the bug.
     """
+    print "   Creating new cards for %s:" % launchpad_project.name
     if not feature_lanes:
         feature_lanes = {}
     new_cardtype = board.default_cardtype.id
@@ -627,7 +644,6 @@
     new_bug_tag = bconf.get("bug_to_card_tag")
     if new_bug_tag is not None:
         for project in all_projects:
-            print "   Creating new cards for %s:" % project.name
             create_new_cards(
                 board, project, new_bug_tag, bconf.get("bug_to_card_type"),
                 bconf.get("bug_to_card_lane"), lp_users.feature_lanes)

=== modified file 'src/lp2kanban/tests/test_bugs2cards.py'
--- src/lp2kanban/tests/test_bugs2cards.py	2016-04-11 21:48:37 +0000
+++ src/lp2kanban/tests/test_bugs2cards.py	2016-04-13 15:47:22 +0000
@@ -352,7 +352,7 @@
         matches, status, assignees, mp_url, mp_type = (
             get_bug_status(bug, ['launchpad'], []))
         self.assertTrue(matches)
-        self.assertEqual(CardStatus.DONE, status)
+        self.assertEqual(CardStatus.DONE_FIX, status)
         self.assertEqual([user], assignees)
 
     def test_get_bug_status_multi_statuses(self):
@@ -608,13 +608,21 @@
         self.assertFalse(should_sync_card(card1, conf))
         self.assertFalse(should_sync_card(card2, conf))
 
-    def test_get_card_status_noop_no_branch(self):
-        # For a bug in 'New', 'Triaged', 'Confirmed' or 'Incomplete' statuses,
-        # the status is unknown.
-        self.assertEqual(None, get_card_status('New', [], None))
-        self.assertEqual(None, get_card_status('Confirmed', [], None))
-        self.assertEqual(None, get_card_status('Incomplete', [], None))
-        self.assertEqual(None, get_card_status('Triaged', [], None))
+    def test_get_card_status_new_no_branch(self):
+        # For a bug in 'New', 'Triaged' or 'Confirmed' or 'Incomplete' statuses,
+        # the branch status is new state.
+        self.assertEqual(
+            CardStatus.NEW,
+            get_card_status('New', [], None))
+        self.assertEqual(
+            CardStatus.NEW,
+            get_card_status('Confirmed', [], None))
+        self.assertEqual(
+            CardStatus.NEW,
+            get_card_status('Triaged', [], None))
+        self.assertEqual(
+            CardStatus.NEW,
+            get_card_status('Incomplete', [], None))
 
     def test_get_card_status_coding_no_bug(self):
         # For a card with no associated bug, an 'In Progress' branch status
@@ -730,19 +738,22 @@
             CardStatus.LANDING,
             get_card_status('In Progress', [], branch_info))
 
-    def test_get_card_status_done(self):
-        # For a bug in 'Fix Released', 'Opinion', 'Won't fix', 'Invalid' or
-        # or 'Expired' statuses, it is considered completely done.
-        self.assertEqual(
-            CardStatus.DONE, get_card_status('Fix Released', [], None))
-        self.assertEqual(
-            CardStatus.DONE, get_card_status('Opinion', [], None))
-        self.assertEqual(
-            CardStatus.DONE, get_card_status("Won't Fix", [], None))
-        self.assertEqual(
-            CardStatus.DONE, get_card_status('Invalid', [], None))
-        self.assertEqual(
-            CardStatus.DONE, get_card_status('Expired', [], None))
+    def test_get_card_status_done_with_fix(self):
+        # For a bug in 'Fix Released' status, it is considered completely done.
+        self.assertEqual(
+            CardStatus.DONE_FIX, get_card_status('Fix Released', [], None))
+
+    def test_get_card_status_done_with_no_fix(self):
+        # For a bug in 'Opinion', 'Won't fix', 'Invalid' or'Expired' statuses,
+        # it is considered completely done without a fix
+        self.assertEqual(
+            CardStatus.DONE_NOFIX, get_card_status('Opinion', [], None))
+        self.assertEqual(
+            CardStatus.DONE_NOFIX, get_card_status("Won't Fix", [], None))
+        self.assertEqual(
+            CardStatus.DONE_NOFIX, get_card_status('Invalid', [], None))
+        self.assertEqual(
+            CardStatus.DONE_NOFIX, get_card_status('Expired', [], None))
 
 
 class GetCardsForFeatureTest(unittest.TestCase):
@@ -881,7 +892,8 @@
 
 class FauxLaunchpadProject:
 
-    def __init__(self, bug_tasks=None):
+    def __init__(self, name="MyFauxProject", bug_tasks=None):
+        self.name = name
         if bug_tasks is None:
             bug_tasks = []
         self.bug_tasks = bug_tasks
@@ -1146,20 +1158,20 @@
 
     def test_feature_lanes_unset_without_feature_cards(self):
         # When no feature cards exist on a board, the feature_lanes dictionary
-        # is empty and todo_lane setting is not represented.
+        # is empty and new_lanes setting is not represented.
         board = FauxBoard(users=[], feature_cards=[])
         coding = board.addLane("dev::coding")
         card = coding.addCard(FauxCard(tags=["sometag"]))
         card.type = self.branch_type
         lp = None
-        config = {"todo_lane": "my-Next-lane"}
+        config = {"new_lanes": "my-Next-lane"}
         lp_users = LaunchpadUsersForBoard()
         lp_users.set_up_users(lp, board, config)
         self.assertEqual({}, lp_users.feature_lanes)
 
-    def test_feature_lanes_unset_without_todo_lane_config(self):
+    def test_feature_lanes_unset_without_new_lanes_config(self):
         # When feature cards are present, feature_lanes is empty when no
-        # todo_lane setting is in the config.
+        # new_lanes setting is in the config.
         feature_card = FauxCard(tags=["sometag"])
         feature_card.type = self.feature_type
         board = FauxBoard(
@@ -1167,14 +1179,14 @@
         coding_lane = board.addLane("dev::coding")
         coding_lane.addCard(feature_card)
         lp = None
-        config = {"todo_lane": ""}
+        config = {"new_lanes": ""}
         lp_users = LaunchpadUsersForBoard()
         lp_users.set_up_users(lp, board, config)
         self.assertEqual({}, lp_users.feature_lanes)
 
-    def test_feature_lanes_set_with_feature_card_and_static_todo_lane(self):
+    def test_feature_lanes_set_with_feature_card_and_static_new_lanes(self):
         # When a feature card is present and tagged and the config contains
-        # todo_lane which doesn't specify the ${group} variable, feature_lanes
+        # new_lanes which doesn't specify the ${group} variable, feature_lanes
         # will be set for all tags.
         feature_card = FauxCard(tags="sometag,anothertag")
         feature_card.type = self.feature_type
@@ -1183,15 +1195,15 @@
         coding_lane = board.addLane("dev::coding")
         coding_lane.addCard(feature_card)
         lp = None
-        config = {"todo_lane": "dev::coding"}
+        config = {"new_lanes": "dev::coding"}
         lp_users = LaunchpadUsersForBoard()
         lp_users.set_up_users(lp, board, config)
         self.assertEqual(
             {"sometag": coding_lane, "anothertag": coding_lane}, 
             lp_users.feature_lanes)
 
-    def test_feature_lanes_unset_with_group_todo_lane_and_no_assignee(self):
-        # When a feature card is present and tagged and the todo_lane
+    def test_feature_lanes_unset_with_group_new_lanes_and_no_assignee(self):
+        # When a feature card is present and tagged and the new_lanes
         # in the config specifies the ${group} variable, 
         # feature_lanes will be unset when there are no assigned users on the
         # card.
@@ -1202,14 +1214,14 @@
         coding_lane = board.addLane("dev::group1::coding")
         coding_lane.addCard(feature_card)
         lp = None
-        config = {"todo_lane": "dev::${group}::coding"}
+        config = {"new_lanes": "dev::${group}::coding"}
         lp_users = LaunchpadUsersForBoard()
         lp_users.set_up_users(lp, board, config)
         self.assertIsNone(feature_card.assigned_user_id)
         self.assertEqual({}, lp_users.feature_lanes)
 
     def test_feature_lanes_set_for_squad_tags_for_each_configured_group(self):
-        # When todo_lane specifies ${group} variable substitution, feature tag
+        # When new_lanes specifies ${group} variable substitution, feature tag
         # lanes will be set for each configured group name.
         groups_conf = '''
             [Group 1]
@@ -1225,15 +1237,15 @@
         coding_lane2 = board.addLane("dev::Group 2::coding")
         lp = None
         config = {"groups_config_file": groups_file.name,
-                  "todo_lane": "dev::${group}::coding"}
+                  "new_lanes": "dev::${group}::coding"}
         lp_users = LaunchpadUsersForBoard(kanban_to_lp={1:FauxPerson("User1")})
         lp_users.set_up_users(lp, board, config)
         self.assertEqual(
             {"squad-group-1": coding_lane, "squad-group-2": coding_lane2},
             lp_users.feature_lanes)
 
-    def test_feature_lanes_set_with_group_todo_lane_and_assignee(self):
-        # When a feature card is present and tagged and the todo_lane
+    def test_feature_lanes_set_with_group_new_lanes_and_assignee(self):
+        # When a feature card is present and tagged and the new_lanes
         # in the config specifies the ${group} variable, 
         # feature_lanes will be set when there are is an assigned user on the
         # card.
@@ -1256,7 +1268,7 @@
         coding_lane.addCard(feature_card)
         lp = None
         config = {"groups_config_file": groups_file.name,
-                  "todo_lane": "dev::${group}::coding"}
+                  "new_lanes": "dev::${group}::coding"}
         lp_users = LaunchpadUsersForBoard(kanban_to_lp={1:FauxPerson("User1")})
         lp_users.set_up_users(lp, board, config)
         self.assertEqual(
@@ -1340,7 +1352,8 @@
             "qa_lanes": "qa",
             "deploy_lanes": "deploy",
             "downtime_deploy_lanes": "downtime",
-            "done_lanes": "done",
+            "done_fix_lanes": "done-with-fix",
+            "done_nofix_lanes": "done-without-fix",
         }
         self.board = FauxBoard()
         self.backlog = self.board.addLane("backlog")
@@ -1350,7 +1363,8 @@
         self.qa = self.board.addLane("qa")
         self.board.addLane("deploy")
         self.board.addLane("downtime")
-        self.board.addLane("done")
+        self.board.addLane("done-with-fix")
+        self.board.addLane("done-without-fix")
         self.lp_users = LaunchpadUsersForBoard()
 
     def test_coding(self):
@@ -1390,11 +1404,17 @@
             card, CardStatus.DOWNTIME_DEPLOY, self.bconf, [], self.lp_users)
         self.assertEqual("downtime", card.moved_to.path)
 
-    def test_done(self):
-        # DONE cards are moved to the done lane.
-        card = self.backlog.addCard(FauxCard())
-        move_card(card, CardStatus.DONE, self.bconf, [], self.lp_users)
-        self.assertEqual("done", card.moved_to.path)
+    def test_done_without_fix(self):
+        # DONE_NOFIX cards are moved to the done_nofix_lanes target
+        card = self.backlog.addCard(FauxCard())
+        move_card(card, CardStatus.DONE_NOFIX, self.bconf, [], self.lp_users)
+        self.assertEqual("done-without-fix", card.moved_to.path)
+
+    def test_done_with_fix(self):
+        # DONE_FIX cards are moved to the done_fix_lanes target
+        card = self.backlog.addCard(FauxCard())
+        move_card(card, CardStatus.DONE_FIX, self.bconf, [], self.lp_users)
+        self.assertEqual("done-with-fix", card.moved_to.path)
 
     def test_backwards(self):
         # Cards can be moved backwards as well, e.g. go from QA to