Merge ~xnox/ubuntu-release-tools:jiraless-dry-run into ubuntu-release-tools:main

Proposed by Dimitri John Ledkov
Status: Needs review
Proposed branch: ~xnox/ubuntu-release-tools:jiraless-dry-run
Merge into: ubuntu-release-tools:main
Diff against target: 50 lines (+13/-12)
1 file modified
generate-milestone-jira-cards (+13/-12)
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+436341@code.launchpad.net

Commit message

Allow dry-run without Jira credentials or Jira library.

To post a comment you must log in.

Unmerged commits

c1e2340... by Dimitri John Ledkov

generate-milestone-jira-cards: allow dry-run without jira credentials, or jira library

Signed-off-by: Dimitri John Ledkov <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/generate-milestone-jira-cards b/generate-milestone-jira-cards
2index 4e2b178..d2cd5f7 100755
3--- a/generate-milestone-jira-cards
4+++ b/generate-milestone-jira-cards
5@@ -36,8 +36,6 @@ from datetime import date, timedelta
6 import argparse
7 import yaml
8
9-from jira import JIRA
10-
11
12 JIRA_URL = 'https://warthogs.atlassian.net'
13
14@@ -63,9 +61,11 @@ def create_milestone(milestone, template_file, release_date,
15
16 milestone_release = date.fromisoformat(release_date)
17
18- jira = JIRA(basic_auth=(jira_credentials['jira_user'],
19- jira_credentials['jira_token']),
20- server=JIRA_URL)
21+ if not dry_run:
22+ from jira import JIRA
23+ jira = JIRA(basic_auth=(jira_credentials['jira_user'],
24+ jira_credentials['jira_token']),
25+ server=JIRA_URL)
26
27 milestone_data = {
28 'project': jira_project,
29@@ -155,13 +155,14 @@ if __name__ == '__main__':
30 args = parser.parse_args()
31
32 jira_credentials = {}
33- with open(args.credentials) as fp:
34- jira_credentials = yaml.safe_load(fp)
35-
36- if ('jira_user' not in jira_credentials or
37- 'jira_token' not in jira_credentials):
38- print(f'Missing JIRA credentials (looked in {args.credentials})!')
39- sys.exit(1)
40+ if not args.dry_run:
41+ with open(args.credentials) as fp:
42+ jira_credentials = yaml.safe_load(fp)
43+
44+ if ('jira_user' not in jira_credentials or
45+ 'jira_token' not in jira_credentials):
46+ print(f'Missing JIRA credentials (looked in {args.credentials})!')
47+ sys.exit(1)
48
49 create_milestone(args.milestone, args.template, args.release_date,
50 args.jira_project, jira_credentials, args.dry_run,

Subscribers

People subscribed via source and target branches