Merge ~brad-figg/+git/kteam-tools:cranky-config-variable into ~canonical-kernel/+git/kteam-tools:master

[Brad Figg]

The commit message says it all.

[Cory Todd (corytodd)]

Looks like this absorbed #433807 regarding the SRU board. Comments left inline for those proposed changes.

Other commentary inline.

review: Needs Fixing

[Brad Figg (brad-figg)]

I'll resubmit this MP. Yes, it looks like I combined it with another MP.

[Cory Todd (corytodd)]

Okay, I'll check back on the resubmit.

Side note on creating Launchpad merge proposals, I think this (and the other two) have you listed as a reviewer for some reason. This means that once we apply and push these patches, this UI won't show a "merged" status. You will need to either leave a comment with "Approve" selected from the review dropdown box or you could remove yourself from the reviewers list. Either option should work.

[Brad Figg (brad-figg)]

Another option would be to fix launchpad so that it helped with merge proposals instead of making the process cumbersome. The fact that I have to remove myself from review is silly, it shouldn’t put me there by default. It should also default to the repo from which the branch was created rather than make me add that information. It should also start defaulting to showing git repositories when I go to the “code” section of a project.

But, it is what it is and I’ll try to remember to remove myself as a reviewer.

Brad

From: <email address hidden> <email address hidden> on behalf of Cory Todd <email address hidden>
Date: Wednesday, December 14, 2022 at 6:47 AM
To: Brad Figg <email address hidden>
Subject: Re: [Merge] ~brad-figg/+git/kteam-tools:cranky-config-variable into ~canonical-kernel/+git/kteam-tools:master
External email: Use caution opening links or attachments

Okay, I'll check back on the resubmit.

Side note on creating Launchpad merge proposals, I think this (and the other two) have you listed as a reviewer for some reason. This means that once we apply and push these patches, this UI won't show a "merged" status. You will need to either leave a comment with "Approve" selected from the review dropdown box or you could remove yourself from the reviewers list. Either option should work.
--
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcode.launchpad.net%2F~brad-figg%2F%2Bgit%2Fkteam-tools%2F%2Bmerge%2F433810&amp;data=05%7C01%7Cbfigg%40nvidia.com%7C2d0035cccef5497ab36b08dadde22c2a%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C638066260725442087%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=WE9UAAHLRrSavH6gvJjXJ9CR2EeDzIod1d1se10E7mg%3D&amp;reserved=0
You are the owner of ~brad-figg/+git/kteam-tools:cranky-config-variable.

Launchpad-Message-Rationale: Owner
Launchpad-Message-For: brad-figg
Launchpad-Notification-Type: code-review
Launchpad-Branch: ~brad-figg/+git/kteam-tools:cranky-config-variable

Unmerged commits

c7fc0b8... by Brad Figg on 2022-08-06

crl/config.py: allow an environment variable to specify the location of the cranky config file

Signed-off-by: Brad Figg <email address hidden>

3dec060... by Brad Figg on 2022-09-26

ktl/tracking_bug2.py: change warning to a more concise, but better to understand message

Signed-off-by: Brad Figg <email address hidden>

8d806fa... by Brad Figg on 2022-09-26

create-kernel-tasks: Made a couple of the error messages a little easier to understand.

Signed-off-by: Brad Figg <email address hidden>

e2af0b2... by Brad Figg on 2022-09-26

create-kernel-tasks: document what the variables 'cn' and 'sn' stand for

Signed-off-by: Brad Figg <email address hidden>

bc796a3... by Brad Figg on 2022-09-26

Create-kernel-tasks: if --nocards is specified then don't import the
SRUBoard class.

The SRUBoard class imports the jira module and not all users of
create-kernel-tasks has that module. If no jira cards are to be created
there is no need to import SRUBoard.

Signed-off-by: Brad Figg <email address hidden>

diff --git a/cranky/crl/config.py b/cranky/crl/config.py
index c927f31..caea37b 100755
--- a/cranky/crl/config.py
+++ b/cranky/crl/config.py
@@ -12,12 +12,15 @@ class Config:
         if filename is not None and data is not None:
             raise ValueError("supply only one of filename and data")
 
-        if data is None and filename is None:
-            for path in (os.path.join(os.environ['HOME'], '.cranky.yaml'),
-                         os.path.join(os.environ['HOME'], '.cranky')):
-                if os.path.exists(path):
-                    filename = path
-                    break
+        if 'CRANKY_CONFIG_FILE' in os.environ:
+            filename = os.environ['CRANKY_CONFIG_FILE']
+        else:
+            if data is None and filename is None:
+                for path in (os.path.join(os.environ['HOME'], '.cranky.yaml'),
+                             os.path.join(os.environ['HOME'], '.cranky')):
+                    if os.path.exists(path):
+                        filename = path
+                        break
 
         if data is None and filename is not None and os.path.exists(filename):
             with open(filename) as yfd:
diff --git a/ktl/tracking_bug2.py b/ktl/tracking_bug2.py
index 3dd00d2..9b92115 100755
--- a/ktl/tracking_bug2.py
+++ b/ktl/tracking_bug2.py
@@ -192,8 +192,7 @@ class TrackingBug(object):
                 # the bug linking completely. So this would be "normal".
                 s._master_bug_id = p_master
             elif s._master_bug_id != p_master:
-                cwarn('Mismatch between tag and properties: master bug')
-                cwarn('tag: %s / property: %s' % (s._master_bug_id, p_master))
+                cwarn('Mismatch : master bug - tag: %s; property: %s  (lp: #%s)' % (s._master_bug_id, p_master, bug.id))
                 s._master_bug_id = p_master
                 #prefix = 'kernel-sru-%s-of-' % s.__type
                 #s.__update_pfx_tag(prefix, '%s%s' % (prefix, p_master))
diff --git a/stable/create-kernel-tasks b/stable/create-kernel-tasks
index c62b6db..4085a96 100755
--- a/stable/create-kernel-tasks
+++ b/stable/create-kernel-tasks
@@ -13,7 +13,6 @@ sys.path.append(os.path.realpath(
 from ktl.log            import Clog, cerror, cwarn, cinfo, cdebug
 from ktl.kernel_series  import KernelSeries
 from ktl.tracking_bug2  import TrackingBugs, TrackingBugError
-from ktl.sruboard       import SRUBoard, SRUBoardError
 
 class Task():
     def __init__(self, taskset, ks_source, ks_snap=None):
@@ -436,6 +435,7 @@ class TaskSet():
     def CreateCards(self, boardname, dryrun=False, cve=False):
         if dryrun is False and self.board is None:
             try:
+                from ktl.sruboard       import SRUBoard, SRUBoardError
                 self.board = SRUBoard(self.cycletag, cve=cve)
             except SRUBoardError as e:
                 cerror(e)
@@ -540,17 +540,17 @@ Examples:
         devel_set = False
         for handle in args.handle:
             try:
-                (cn, sn) = handle.split(':')
+                (cn, sn) = handle.split(':') # cn = "series codename (focal, jammy, etc.)"; sn = "source name (linux, linux-realtime, linux-aws, etc)"
             except:
                 cerror('Failed to parse handle({})'.format(handle))
                 sys.exit(2)
             ks_series = ks.lookup_series(codename=cn)
             if ks_series is None:
-                cerror('{} seems to be no valid series codename'.format(cn))
+                cerror(f'"{cn}" is not a valid series codename. It was not found in kernel-series.info.')
                 sys.exit(3)
             ks_source = ks_series.lookup_source(sn)
             if ks_source is None:
-                cerror('{} is no valid source in {}'.format(sn, cn))
+                cerror(f'"{sn} is not a valid source within the "{cn}" series.')
                 sys.exit(3)
             # The first handle decides whether we treat this as devel cycle or stable.
             # Instead of trying to figure out whether something originates in a development