Commit 58b81d4e authored by morgan's avatar morgan 😸 Committed by morgan
Browse files

Bug 41445: Better handle bugzilla "Web Compatibility" issues in generate-bugzilla-triage-csv 

- set component to "Web Compatibility" for git-scraped issues containing "webcompat" string in their summary
- always use FIREFOX_NIGHTLY_xxx_END tags as git commits
parent 57d4514a

tools/browser/generate-bugzilla-triage-csv

+14 −12
Changes for tools/browser/generate-bugzilla-triage-csv: 14 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
browser_label="Apps::Product::TorBrowser"

esr_label="esr-next"

priority_label="Priority::Blocker"

impact_label="Impact::Unknown"

impact_label="Apps::Impact::Unknown"

type_label="Apps::Type::Audit"



# milestone for the next major Tor Browser release
@@ -16,17 +16,15 @@ function echoerr() { echo "$@" 1>&2; } 
script_dir=$(dirname "${BASH_ARGV0:-$0}")



# help dialog

if [ "$#" -ne 4 ]; then

    echoerr "Usage: $0 <ff-version> <begin-commit> <end-commit> <gitlab-audit-issue>"

if [ "$#" -ne 2 ]; then

    echoerr "Usage: $0 <ff-version> <gitlab-audit-issue>"

    echoerr

    echoerr "ff-version             rapid-release Firefox version to audit"

    echoerr "begin-commit           starting firefox commit of this Firefox version"

    echoerr "end-commit             ending firefox commit of this Firefox version"

    echoerr "gitlab-audit-issue     tor-browser GitLab issue number for this audit"

    echoerr ""

    echoerr "Example:"

    echoerr ""

    echoerr "$0 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303"

    echoerr "$0 129 43303"

    exit 1

fi
@@ -56,10 +54,10 @@ check_exists wget 


# Assign arguments to named variables

firefox_version=$1

git_begin=$2

git_end=$3

audit_issue=$4

reviewers="${@:5}"

firefox_old_version=$((firefox_version - 1))

audit_issue=$2

git_begin="FIREFOX_NIGHTLY_${firefox_old_version}_END"

git_end="FIREFOX_NIGHTLY_${firefox_version}_END"



# Check valid Firefox version

if ! [[ "${firefox_version}" =~ ^[1-9][0-9]{2}$ ]]; then
@@ -151,7 +149,12 @@ git log --format='%s' $git_begin..$git_end \ 
        printf ",\n" >> "${git_json}"

    fi



    printf "  { \"component\": \"Unknown\", \"id\": %s, \"summary\": \"%s\" }" ${id} "${summary}" >> "${git_json}"

    component="Unknown"

    if [[ "${summary}" =~ webcompat ]]; then

        component="Web Compatibility"

    fi



    printf "  { \"component\": \"%s\", \"id\": %s, \"summary\": \"%s\" }" "${component}" ${id} "${summary}" >> "${git_json}"

done

printf "\n]\n" >> "${git_json}"
@@ -171,7 +174,6 @@ bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,com 


wget "${bugzilla_json_query}" -O ${bugzilla_json}





#

# Create Union of these two sets of issues

#