Skip to content

Commit a855fc6

Browse files
author
Katelyn Baker
authored
CORDA-3017 - Fix release tooling when product name != jira project (corda#5229)
1 parent dd98461 commit a855fc6

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

release-tools/testing/test-manager

+12-4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ product_map = {
4242
}
4343
# }}}
4444

45+
# {{{ Map product name to Jira project name
46+
project_map = {
47+
'Corda' : 'Corda',
48+
'Corda Enterprise' : 'Corda Enterprise',
49+
'ENM' : 'CENM'
50+
}
51+
# }}}
52+
4553
# {{{ JIRA queries
4654
QUERY_LIST_TEST_CASES = \
4755
u'project = R3T AND type = "Platform Test Template" AND status = Active AND labels = "{}" ORDER BY key'
@@ -88,7 +96,7 @@ def show_status(args):
8896
user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
8997
if not user or not password: sys.exit(1)
9098
jira = Jira().login(user, password)
91-
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
99+
version = '{} {}'.format(project_map[product_map[args.PRODUCT]], args.VERSION)
92100
candidate = '{} {}'.format(version, format_candidate(args.CANDIDATE)) if args.CANDIDATE else version
93101
if args.CANDIDATE:
94102
print(u'Status of test runs for {} version {} release candidate {}:'.format(yellow(product_map[args.PRODUCT]), yellow(args.VERSION), yellow(format_candidate(args.CANDIDATE))))
@@ -148,7 +156,7 @@ def create_version(args):
148156
user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
149157
if not user or not password: sys.exit(1)
150158
jira = Jira().login(user, password)
151-
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
159+
version = '{} {}'.format(project_map[product_map[args.PRODUCT]], args.VERSION)
152160
version = '{} {}'.format(version, format_candidate(args.CANDIDATE)) if args.CANDIDATE else version
153161
confirm(u'Create new version {}?'.format(yellow(version)), auto_yes=args.yes or args.dry_run)
154162
print()
@@ -173,7 +181,7 @@ def create_release(args):
173181
user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
174182
if not user or not password: sys.exit(1)
175183
jira = Jira().login(user, password)
176-
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
184+
version = '{} {}'.format(project_map[product_map[args.PRODUCT]], args.VERSION)
177185
confirm(u'Create test cases for {} version {}?'.format(yellow(product_map[args.PRODUCT]), yellow(args.VERSION)), auto_yes=args.yes or args.dry_run)
178186
if args.verbose:
179187
print(faint('[{}]'.format(QUERY_LIST_TEST_CASES.format(args.PRODUCT))))
@@ -238,7 +246,7 @@ def create_release_candidate(args):
238246
user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
239247
if not user or not password: sys.exit(1)
240248
jira = Jira().login(user, password)
241-
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
249+
version = '{} {}'.format(project_map[product_map[args.PRODUCT]], args.VERSION)
242250
CANDIDATE = args.CANDIDATE[0]
243251
candidate = '{} {}'.format(version, format_candidate(CANDIDATE))
244252
confirm(u'Create test run tickets for {} version {} release candidate {}?'.format(yellow(product_map[args.PRODUCT]), yellow(args.VERSION), yellow(format_candidate(CANDIDATE))), auto_yes=args.yes or args.dry_run)

0 commit comments

Comments
 (0)