Skip to content

Commit b971e46

Browse files
andrewnicolsandrewnicols
authored
Merge pull request #347 from andrewnicols/namedCustomFields
Switch to named custom fields
2 parents 3b74299 + d110124 commit b971e46

File tree

12 files changed

+60
-59
lines changed

12 files changed

+60
-59
lines changed

‎jira.sh‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66

77
set -e
88

9-
customfield_automatedTestResults=17112
10-
customfield_componentLeadReview=15810
11-
customfield_currentlyInIntegration=10211
12-
customfield_integrationDate=10210
13-
customfield_integrationPriority=12210
14-
customfield_integrator=10110
15-
customfield_pullFromRepository=10100
16-
customfield_tester=10011
9+
customfield_automatedTestResults="Automated test results"
10+
customfield_componentLeadReview="Component Lead Review"
11+
customfield_currentlyInIntegration="Currently in integration"
12+
customfield_integrationDate="Integration date"
13+
customfield_integrationPriority="Integration priority"
14+
customfield_integrator="Integrator"
15+
customfield_pullFromRepository="Pull from Repository"
16+
customfield_tester="Tester"
17+
1718

1819
filter_candidatesForCLR="Weekly: Candidates for CLR (not held)"
1920
filter_candidatesForIntegration="Weekly: Candidates for Integration (not held)"

‎tracker_automations/bulk_prelaunch_jobs/criteria/list_of_mdls_sdev/query.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
${basereq} --action getIssueList \
22
--jql "project = 'Moodle' \
33
AND issue IN (${issueslist}) \
4-
AND ${customfield_pullFromRepository} ~ 'integration/security-testing' \
4+
AND \"${customfield_pullFromRepository}\" ~ 'integration/security-testing' \
55
AND level IS NOT EMPTY \
66
ORDER BY priority DESC, votes DESC, 'Last comment date' ASC" \
77
--outputFormat 101 \

‎tracker_automations/close_tested_issues/close_tested_issues.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ for issue in $( sed -n 's/^"\(MDL-[0-9]*\)".*/\1/p' "${resultfile}" ); do
6262
--issue ${issue} \
6363
--transition "Mark as committed" \
6464
--resolution "Fixed" \
65-
--field "customfield_${customfield_currentlyInIntegration}=" \
66-
--field "customfield_${customfield_integrationDate}=${altdate}" \
65+
--field "${customfield_currentlyInIntegration}"= \
66+
--field "${customfield_integrationDate}"="${altdate}" \
6767
--comment "${altcomment}"
6868
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue}" >> "${logfile}"
6969
done

‎tracker_automations/component_leads_integration_mover/component_leads_integration_mover.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jq -c '.[]' ${resultfile} | while read -r json; do
167167
${basereq} --action transitionIssue \
168168
--issue ${issue} \
169169
--transition "CI Global Self-Transition" \
170-
--field "customfield_${customfield_componentLeadReview}=No"
170+
--field "${customfield_componentLeadReview}"=No
171171
else
172172
# CLR. Real transition to Waiting for CLR.
173173
${basereq} --action transitionIssue \

‎tracker_automations/continuous_manage_queues/lib.sh‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ function run_A2() {
100100
# that non-transitional transition and use normal update.
101101
#${basereq} --action updateIssue \
102102
# --issue ${issue} \
103-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
103+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
104104
${basereq} --action transitionIssue \
105105
--issue ${issue} \
106106
--transition "CI Global Self-Transition" \
107-
--field "customfield_${customfield_currentlyInIntegration}=Yes" \
108-
--field "customfield_${customfield_componentLeadReview}=No" \
109-
--field "customfield_${customfield_integrator}=" \
110-
--field "customfield_${customfield_tester}=" \
107+
--field "${customfield_currentlyInIntegration}"=Yes \
108+
--field "${customfield_componentLeadReview}"=No \
109+
--field "${customfield_integrator}"= \
110+
--field "${customfield_tester}"= \
111111
--comment "Continuous queues manage: Moving to current because it's important" \
112112
--role "Integrators"
113113
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} moved to current: important" >> "${logfile}"
@@ -172,14 +172,14 @@ function run_A3a() {
172172
# that non-transitional transition and use normal update.
173173
#${basereq} --action updateIssue \
174174
# --issue ${issue} \
175-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
175+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
176176
${basereq} --action transitionIssue \
177177
--issue ${issue} \
178178
--transition "CI Global Self-Transition" \
179-
--field "customfield_${customfield_currentlyInIntegration}=Yes" \
180-
--field "customfield_${customfield_componentLeadReview}=No" \
181-
--field "customfield_${customfield_integrator}=" \
182-
--field "customfield_${customfield_tester}=" \
179+
--field "${customfield_currentlyInIntegration}"=Yes \
180+
--field "${customfield_componentLeadReview}"=No \
181+
--field "${customfield_integrator}"= \
182+
--field "${customfield_tester}"= \
183183
--comment "Continuous queues manage: Moving to current given we are below the threshold ($currentmin)" \
184184
--role "Integrators"
185185
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} moved to current: threshold (before ${lastweekdate})" >> "${logfile}"
@@ -280,14 +280,14 @@ function run_B1b() {
280280
# that non-transitional transition and use normal update.
281281
#${basereq} --action updateIssue \
282282
# --issue ${issue} \
283-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
283+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
284284
${basereq} --action transitionIssue \
285285
--issue ${issue} \
286286
--transition "CI Global Self-Transition" \
287-
--field "customfield_${customfield_currentlyInIntegration}=Yes" \
288-
--field "customfield_${customfield_componentLeadReview}=No" \
289-
--field "customfield_${customfield_integrator}=" \
290-
--field "customfield_${customfield_tester}=" \
287+
--field "${customfield_currentlyInIntegration}"=Yes \
288+
--field "${customfield_componentLeadReview}"=No \
289+
--field "${customfield_integrator}"= \
290+
--field "${customfield_tester}"= \
291291
--comment "Continuous queues manage: Moving to current given we are below the threshold ($currentmin)" \
292292
--role "Integrators"
293293
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} moved to current on-sync: threshold" >> "${logfile}"
@@ -393,13 +393,13 @@ function run_C() {
393393
# that non-transitional transition and use normal update.
394394
#${basereq} --action updateIssue \
395395
# --issue ${issue} \
396-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
396+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
397397
${basereq} --action transitionIssue \
398398
--issue ${issue} \
399399
--transition "CI Global Self-Transition" \
400-
--field "customfield_${customfield_currentlyInIntegration}=" \
401-
--field "customfield_${customfield_integrator}=" \
402-
--field "customfield_${customfield_tester}=" \
400+
--field "${customfield_currentlyInIntegration}"= \
401+
--field "${customfield_integrator}"= \
402+
--field "${customfield_tester}"= \
403403
--comment "Continuous queues manage: Moving out from current because it's held" \
404404
--role "Integrators"
405405
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} moved out from current: held" >> "${logfile}"

‎tracker_automations/delay_awaiting_issues/delay_awaiting_issues.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ for issue in $( sed -n 's/^"\(MDL-[0-9]*\)".*/\1/p' "${resultfile}" ); do
6363
${basereq} --action transitionIssue \
6464
--issue ${issue} \
6565
--transition "CI Global Self-Transition" \
66-
--field "customfield_${customfield_currentlyInIntegration}=" \
67-
--field "customfield_${customfield_integrationPriority}=1" \
66+
--field "${customfield_currentlyInIntegration}"= \
67+
--field "${customfield_integrationPriority}"=1 \
6868
--comment "${altcomment}"
6969
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue}" >> "${logfile}"
7070
done

‎tracker_automations/manage_waiting_for_feedback/manage_waiting_for_feedback.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ for issue in $( sed -n 's/^"\(MDL-[0-9]*\)".*/\1/p' "${resultfile}" ); do
144144
${basereq} --action transitionIssue \
145145
--issue ${issue} \
146146
--transition "Reopen Issue" \
147-
--field "customfield_${customfield_currentlyInIntegration}=" \
148-
--field "customfield_${customfield_componentLeadReview}=" \
147+
--field "${customfield_currentlyInIntegration}"= \
148+
--field "${customfield_componentLeadReview}"= \
149149
--comment "${comment}"
150150
done
151151

‎tracker_automations/move_to_current_integration/move_to_current_integration.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ for issue in $( sed -n 's/^"\(MDL-[0-9]*\)".*/\1/p' "${resultfile}" ); do
6161
# that non-transitional transition and use normal update.
6262
#${basereq} --action updateIssue \
6363
# --issue ${issue} \
64-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}}=Yes"
64+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
6565
${basereq} --action transitionIssue \
6666
--issue ${issue} \
6767
--transition "CI Global Self-Transition" \
68-
--field "customfield_${customfield_integrator}=" \
69-
--field "customfield_${customfield_integrationDate}=" \
70-
--field "customfield_${customfield_currentlyInIntegration}=Yes" \
71-
--field "customfield_${customfield_componentLeadReview}=No" \
72-
--field "customfield_${customfield_tester}=" \
68+
--field "${customfield_integrator}"= \
69+
--field "${customfield_integrationDate}"= \
70+
--field "${customfield_currentlyInIntegration}"=Yes \
71+
--field "${customfield_componentLeadReview}"=No \
72+
--field "${customfield_tester}"= \
7373
--comment "Moving this issue to current integration cycle, will be reviewed soon. Thanks for the hard work!"
7474
${basereq} --action removeLabels \
7575
--issue ${issue} \

‎tracker_automations/mv_reopened_out_from_current/mv_reopened_out_from_current.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ while read line; do
7575
# that non-transitional transition and use normal update.
7676
#${basereq} --action updateIssue \
7777
# --issue ${issue} \
78-
# --field "customfield_${customfield_currentlyInIntegration}=" \
78+
# --field "${customfield_currentlyInIntegration}"= \
7979
# --comment "Moving this reopened issue out from current integration. Please, re-submit it for integration once ready."
8080
#
8181
${basereq} --action transitionIssue \
8282
--issue ${issue} \
8383
--transition "CI Global Self-Transition" \
8484
--fixVersions "${keepversion}" \
85-
--field "customfield_${customfield_currentlyInIntegration}=" \
86-
--field "customfield_${customfield_automatedTestResults}=" \
85+
--field "${customfield_currentlyInIntegration}"= \
86+
--field "${customfield_automatedTestResults}"= \
8787
--comment "Moving this reopened issue out from current integration. Please, re-submit it for integration once ready."
8888
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue}" >> "${logfile}"
8989
done < "${resultfile}"

‎tracker_automations/normal_manage_queues/lib.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ function run_A() {
6262
# that non-transitional transition and use normal update.
6363
#${basereq} --action updateIssue \
6464
# --issue ${issue} \
65-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
65+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
6666
${basereq} --action transitionIssue \
6767
--issue ${issue} \
6868
--transition "CI Global Self-Transition" \
69-
--field "customfield_${customfield_currentlyInIntegration}=Yes" \
70-
--field "customfield_${customfield_componentLeadReview}=No" \
71-
--field "customfield_${customfield_integrator}=" \
72-
--field "customfield_${customfield_tester}=" \
69+
--field "${customfield_currentlyInIntegration}"=Yes \
70+
--field "${customfield_componentLeadReview}"=No \
71+
--field "${customfield_integrator}"= \
72+
--field "${customfield_tester}"= \
7373
--comment "Normal queues manage: Moving to current because it's important" \
7474
--role "Integrators"
7575
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} moved to current: important" >> "${logfile}"
@@ -134,14 +134,14 @@ function run_B() {
134134
# that non-transitional transition and use normal update.
135135
#${basereq} --action updateIssue \
136136
# --issue ${issue} \
137-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
137+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
138138
${basereq} --action transitionIssue \
139139
--issue ${issue} \
140140
--transition "CI Global Self-Transition" \
141-
--field "customfield_${customfield_currentlyInIntegration}=Yes" \
142-
--field "customfield_${customfield_componentLeadReview}=No" \
143-
--field "customfield_${customfield_integrator}=" \
144-
--field "customfield_${customfield_tester}=" \
141+
--field "${customfield_currentlyInIntegration}"=Yes \
142+
--field "${customfield_componentLeadReview}"=No \
143+
--field "${customfield_integrator}"= \
144+
--field "${customfield_tester}"= \
145145
--comment "Normal queues manage: Moving to current given we are below the threshold ($currentmin)" \
146146
--role "Integrators"
147147
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} moved to current: threshold" >> "${logfile}"
@@ -175,11 +175,11 @@ function run_C() {
175175
# that non-transitional transition and use normal update.
176176
#${basereq} --action updateIssue \
177177
# --issue ${issue} \
178-
# --field="customfield_${customfield_integrator}=" --field="customfield_${customfield_integrationDate}=" --field="customfield_${customfield_currentlyInIntegration}=Yes"
178+
# --field="${customfield_integrator}"= --field="${customfield_integrationDate}"= --field="${customfield_currentlyInIntegration}"=Yes
179179
${basereq} --action transitionIssue \
180180
--issue ${issue} \
181181
--transition "CI Global Self-Transition" \
182-
--field "customfield_${customfield_integrationPriority}=1" \
182+
--field "${customfield_integrationPriority}"=1 \
183183
--comment "Normal queues manage: Raising integration priority after ${waitingdays} days awaiting" \
184184
--role "Integrators"
185185
echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue} raised integration priority" >> "${logfile}"

0 commit comments

Comments
 (0)