Skip to content

Commit 2eb3ec5

Browse files
committed
Correctly quote jira filters
1 parent 26539df commit 2eb3ec5

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

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
@@ -114,7 +114,7 @@ fi
114114

115115
# Search for all the issues awaiting for integration and not being decided between CLR/IR.
116116
${basereq} --action getIssueList \
117-
--jql "filter = ${filter_integrationCLRDecision} ${excludequery}" \
117+
--jql "filter = '${filter_integrationCLRDecision}' ${excludequery}" \
118118
--columns="Key,Assignee,Peer reviewer,Components,Security Level,Summary" \
119119
--outputFormat=4 \
120120
--outputType=json \

tracker_automations/continuous_manage_queues/lib.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ function run_A1() {
3030

3131
# Get the list of issues.
3232
${basereq} --action getIssueList \
33-
--jql "(filter=${filter_candidatesForIntegration}) \
33+
--jql "(filter='${filter_candidatesForIntegration}') \
3434
AND type IN ('New Feature', Improvement) \
35-
AND NOT filter = ${filter_issuesVotedToUnhold} \
35+
AND NOT filter = '${filter_issuesVotedToUnhold}' \
3636
AND NOT (status changed FROM 'Waiting for component lead review' TO 'Waiting for integration review' AFTER -2h)" \
3737
--file "${resultfile}"
3838

@@ -63,10 +63,10 @@ If you want Moodle HQ to consider including it into the incoming major release p
6363
function run_A2() {
6464
# Get the list of issues.
6565
${basereq} --action getIssueList \
66-
--jql "filter=${filter_candidatesForIntegration}
67-
AND NOT filter = ${filter_issuesHeldUntilAfterRelease}
66+
--jql "filter='${filter_candidatesForIntegration}'
67+
AND NOT filter = '${filter_issuesHeldUntilAfterRelease}'
6868
AND (
69-
filter = ${filter_mustFixIssues} OR
69+
filter = '${filter_mustFixIssues}' OR
7070
labels IN (mdlqa) OR
7171
level IS NOT EMPTY
7272
)" \
@@ -134,7 +134,7 @@ function run_A3a() {
134134
if [[ "$counter" -lt "$currentmin" ]]; then
135135
# Get an ordered list of issues in the candidate queue.
136136
${basereq} --action getIssueList \
137-
--jql "filter=${filter_candidatesForIntegration} \
137+
--jql "filter='${filter_candidatesForIntegration}' \
138138
ORDER BY Rank ASC" \
139139
--file "${resultfile}"
140140

@@ -194,9 +194,9 @@ function run_A3b() {
194194
# - Must-fix issues
195195
# - mdlqa issues
196196
${basereq} --action getIssueList \
197-
--jql "filter=${filter_candidatesForIntegration} OR (
198-
filter=${filter_candidatesForCLR} AND NOT (
199-
filter = ${filter_mustFixIssues} OR
197+
--jql "filter='${filter_candidatesForIntegration}' OR (
198+
filter='${filter_candidatesForCLR}' AND NOT (
199+
filter = '${filter_mustFixIssues}' OR
200200
labels IN (mdlqa)
201201
)
202202
)" \
@@ -242,7 +242,7 @@ function run_B1b() {
242242
if [[ "$counter" -lt "$currentmin" ]]; then
243243
# Get an ordered list of issues in the candidate queue.
244244
${basereq} --action getIssueList \
245-
--jql "filter=${filter_candidatesForIntegration} \
245+
--jql "filter='${filter_candidatesForIntegration}' \
246246
ORDER BY Rank ASC" \
247247
--file "${resultfile}"
248248

@@ -305,9 +305,9 @@ function run_B1a() {
305305

306306
# Get the list of issues.
307307
${basereq} --action getIssueList \
308-
--jql "(filter=${filter_candidatesForIntegration} OR filter=${filter_candidatesForCLR}) \
308+
--jql "(filter='${filter_candidatesForIntegration}' OR filter='${filter_candidatesForCLR}') \
309309
AND type IN ('New Feature', Improvement) \
310-
AND NOT filter = ${filter_issuesVotedToUnhold}" \
310+
AND NOT filter = '${filter_issuesVotedToUnhold}'" \
311311
--file "${resultfile}"
312312

313313
# Iterate over found issues and perform the actions with them.

tracker_automations/normal_manage_queues/lib.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ source "${mydir}/../../jira.sh"
2323
function run_A() {
2424
# Get the list of issues.
2525
${basereq} --action getIssueList \
26-
--jql "filter=${filter_candidatesForIntegration}
27-
AND NOT filter = ${filter_issuesHeldUntilAfterRelease}
26+
--jql "filter='${filter_candidatesForIntegration}'
27+
AND NOT filter = '${filter_issuesHeldUntilAfterRelease}'
2828
AND (
29-
filter = ${filter_mustFixIssues} OR
29+
filter = '${filter_mustFixIssues}' OR
3030
labels IN (mdlqa) OR
3131
priority IN (Critical, Blocker) OR
3232
level IS NOT EMPTY OR
@@ -96,7 +96,7 @@ function run_B() {
9696
if [[ "$counter" -lt "$currentmin" ]]; then
9797
# Get an ordered list of up to issues in the candidate queue.
9898
${basereq} --action getIssueList \
99-
--jql "filter=${filter_candidatesForIntegration} \
99+
--jql "filter='${filter_candidatesForIntegration}' \
100100
ORDER BY Rank ASC" \
101101
--file "${resultfile}"
102102

@@ -152,7 +152,7 @@ function run_B() {
152152
function run_C() {
153153
# Get the list of issues.
154154
${basereq} --action getIssueList \
155-
--jql "filter=${filter_candidatesForIntegration}
155+
--jql "filter='${filter_candidatesForIntegration}'
156156
AND 'Integration priority' = 0
157157
AND NOT (issueLinkType = 'blocks' OR issueLinkType = 'is blocked by')
158158
AND NOT status CHANGED AFTER -${waitingdays}d" \

tracker_automations/send_rebase_message/send_rebase_message.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fi
5353

5454
# Let's search all the issues under candidates queue.
5555
${basereq} --action getIssueList \
56-
--jql "filter = ${filter_candidatesForIntegration}" \
56+
--jql "filter = '${filter_candidatesForIntegration}'" \
5757
--file "${resultfile}"
5858

5959
# Iterate over found issues and perform the actions with them
@@ -75,7 +75,7 @@ TIA and ciao :-)"}
7575

7676
# Let's search all the issues under current integration waiting for review or in progress.
7777
${basereq} --action getIssueList \
78-
--jql "filter = ${filter_issuesWaitingForReviewOrInProgress}" \
78+
--jql "filter = '${filter_issuesWaitingForReviewOrInProgress}'" \
7979
--file "${resultfile}"
8080

8181
# Iterate over found issues and perform the actions with them.

0 commit comments

Comments
 (0)