| ... |
... |
@@ -158,7 +158,7 @@ printf "\n]\n" >> "${git_json}" |
|
158
|
158
|
query_tail="&f1=product&n1=1&o1=anyexact&v1=Thunderbird%2CCalendar%2CChat%20Core%2CMailNews%20Core&f2=target_milestone&o2=substring&v2=${firefox_version}&limit=0"
|
|
159
|
159
|
|
|
160
|
160
|
bugzilla_query="https://bugzilla.mozilla.org/buglist.cgi?${query_tail}"
|
|
161
|
|
-bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,summary${query_tail}"
|
|
|
161
|
+bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,component,summary${query_tail}"
|
|
162
|
162
|
|
|
163
|
163
|
wget "${bugzilla_json_query}" -O ${bugzilla_json}
|
|
164
|
164
|
|
| ... |
... |
@@ -174,13 +174,14 @@ jq -s '[ (.[0].bugs)[], (.[1])[] ] | group_by(.id) | map(.[0])' "${bugzilla_json |
|
174
|
174
|
# Generate Triage CSV
|
|
175
|
175
|
#
|
|
176
|
176
|
|
|
177
|
|
-echo "\"Review\",,\"Bugzilla Bug\""
|
|
|
177
|
+echo "\"Review\",,\"Bugzilla Component\",\"Bugzilla Bug\""
|
|
178
|
178
|
|
|
179
|
|
-jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \
|
|
180
|
|
-| while IFS='|' read -r id summary; do
|
|
|
179
|
+jq '. | sort_by([.component, .id])[] | "\(.id)|\(.component)|\(.summary)"' ${union_json} \
|
|
|
180
|
+| while IFS='|' read -r id component summary; do
|
|
181
|
181
|
|
|
182
|
182
|
# bugzilla info
|
|
183
|
183
|
id="${id:1}"
|
|
|
184
|
+ component="${component:0}"
|
|
184
|
185
|
summary="${summary:0:-1}"
|
|
185
|
186
|
summary=$(jq_unescape "${summary}")
|
|
186
|
187
|
# short summary for gitlab issue title
|
| ... |
... |
@@ -207,6 +208,7 @@ jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \ |
|
207
|
208
|
echoerr "Skipped Bugzilla ${id}: ${summary_short}"
|
|
208
|
209
|
else
|
|
209
|
210
|
csv_summary=$(csv_escape "${summary}")
|
|
|
211
|
+ csv_component=$(csv_escape "${component}")
|
|
210
|
212
|
|
|
211
|
213
|
# parent issue
|
|
212
|
214
|
bugzilla_url="https://bugzilla.mozilla.org/show_bug.cgi?id=${id}"
|
| ... |
... |
@@ -221,7 +223,7 @@ jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \ |
|
221
|
223
|
create_issue=$(csv_escape "=HYPERLINK(\"${new_issue_url}\", \"New Issue\")")
|
|
222
|
224
|
bugzilla_link=$(csv_escape "=HYPERLINK(\"${bugzilla_url}\", \"Bugzilla ${id}: ${csv_summary}\")")
|
|
223
|
225
|
|
|
224
|
|
- echo "FALSE,\"${create_issue}\",\"${bugzilla_link}\","
|
|
|
226
|
+ echo "FALSE,\"${create_issue}\",\"${csv_component}\",\"${bugzilla_link}\","
|
|
225
|
227
|
fi
|
|
226
|
228
|
done
|
|
227
|
229
|
|