Merge pull request #483 from Martchus/leap-throttle

Allow configuring target-specific throttles

Author: mergify[bot]

os-autoinst-obs-auto-submit

@@ -13,6 +13,7 @@ dry_run="${dry_run:-"0"}"
 osc_poll_interval="${osc_poll_interval:-2}"
 osc_build_start_poll_tries="${osc_build_start_poll_tries:-30}"
 throttle_days=${throttle_days:-2}
+throttle_days_leap_16=${throttle_days_leap_16:-7}
 git_user=${git_user:-os-autoinst-obs-workflow}
 XMLSTARLET=$(command -v xmlstarlet || true)
 [[ -n $XMLSTARLET ]] || (echo "Need xmlstarlet" >&2 && exit 1)
@@ -30,6 +31,11 @@ declare -A git_branches=(
     ['openSUSE:Leap:16.0']=leap-16.0
 )
 
+# allow specifying target-specific throttle variables
+declare -A throttle_variables=(
+    ['openSUSE:Leap:16.0']=throttle_days_leap_16
+)
+
 encode_variable() {
     #  https://stackoverflow.com/a/298258
     perl -MURI::Escape -e 'print uri_escape($ARGV[0])' "$1"
@@ -281,32 +287,33 @@ get_project_packages() {
 }
 
 has_pending_submission() {
-    [[ $throttle_days == 0 ]] && return 0
-
     local package=$1 target=$2
     local git_branch=${git_branches[$target]:-}
+    local throttle_variable=${throttle_variables[$target]:-throttle_days}
+    local throttle_days_value=${!throttle_variable:-0}
     local requestlist recent_pr_url
+    [[ $throttle_days_value == 0 ]] && return 0
     log-info "has_pending_submission($package, $target)"
 
     # throttle number of submissions to allow only one PR or SR within a certain number of days
     if [[ $git_branch ]]; then
         # check for PR on Gitea
         recent_pr_url=$($git_obs -q api "repos/pool/$package/pulls?state=open&sort=recentupdate" 2> /dev/null \
             | jq --raw-output \
-                --arg days "$throttle_days" \
+                --arg days "$throttle_days_value" \
                 --arg target "$git_branch" \
                 --arg login "$git_user" \
                 '[.[] | select(.base.ref == $target) | select(.user.login == $login) | select(.updated_at | strptime("%Y-%m-%dT%H:%M:%S%z") | mktime > (now - ($days | tonumber) * 86400)) | .html_url] | first')
         if [[ $recent_pr_url != null ]]; then
-            log-info "Skipping submission, there is the still pending PR '$recent_pr_url' by $git_user targeting $git_branch younger than $throttle_days days."
+            log-info "Skipping submission, there is the still pending PR '$recent_pr_url' by $git_user targeting $git_branch younger than $throttle_days_value days."
             return 1
         fi
     else
         # check for SR on OBS
         # note: Avoid using `grep --quiet` here to keep consuming input so osc does not run into "BrokenPipeError: [Errno 32] Broken pipe".
-        requestlist=$($osc request list --project "$target" --package "$package" --type submit --state new,review --mine --days "$throttle_days")
-        if echo "$requestlist" | grep 'Created by' > /dev/null; then
-            log-info "Skipping submission, there is still a pending SR for package $package in project $target younger than $throttle_days days."
+        requestlist=$($osc request list --project "$dst_project" --package "$package" --type submit,maintenance_incident --state new,review --days "$throttle_days_value")
+        if echo "$requestlist" | grep --fixed-strings "$target" > /dev/null; then
+            log-info "Skipping submission, there is still a pending SR for package $package in project $target younger than $throttle_days_value days."
             echo "$requestlist"
             return 1
         fi

test/08-auto-submit.t

@@ -1,19 +1,22 @@
 #!/usr/bin/env bash
 
 source test/init
-plan tests 11
+plan tests 13
 
 mock_osc() {
     local cmd=$1
     local args=(${@:2})
-    if [[ $cmd == 'request' && ${args[0]} == 'list' ]]; then
+    if [[ $cmd == 'request' && ${args[0]} == 'list' && ${args[9]} == '--days' && ${args[10]} == "$throttle_days" ]]; then
         _request_list
     fi
 }
 
-_request_list() {
-    echo "Created by: foo"
-}
+_requests=(
+    'submit:          devel:openQA:tested/openQA@c0f8ee6a233ed250dbc54c19dee50118 -> openSUSE:Factory'
+    'maintenance_incident: devel:openQA:tested/openQA@ae3d930a703dc411e249d644ad8b6802 -> openSUSE:Maintenance (release in openSUSE:Backports:SLE-15-SP6:Update)'
+)
+
+_request_list() { echo "${_requests[@]}"; }
 
 mock_git_obs() {
     if [[ $3 == 'repos/pool/openQA/pulls?state=open&sort=recentupdate' ]]; then
@@ -42,17 +45,17 @@ is "$rc" 0 "returns 0 with throttle_days=0"
 
 throttle_days=1
 try has_pending_submission "$package" "$submit_target"
-is "$rc" 1 "returns 1 with existing SRs"
-like "$got" "Created by: foo" "expected output"
+is "$rc" 1 "returns 1 with existing SR"
+like "$got" "Skipping submission, there is still a pending SR for package os-autoinst" "expected output"
 
-_request_list() {
-    echo ""
-}
+_request_list() { echo; }
 try has_pending_submission "$package" "$submit_target"
 is "$rc" 0 "returns 0 without existing SRs"
 like "$got" "info.*has_pending_submission" "no output"
 
 submit_target=openSUSE:Leap:16.0
+throttle_days=3 # expected to be ignored for openSUSE:Leap:16.0
+throttle_days_leap_16=1
 try has_pending_submission "$package" "$submit_target"
 is "$rc" 0 "returns 0 without existing PRs"
 like "$got" "info.*has_pending_submission\\($package, $submit_target\\)$" "no output (no PR)"
@@ -62,7 +65,13 @@ try has_pending_submission "$package" "$submit_target"
 is "$rc" 0 "returns 0 with existing PR older than throttle config of $throttle_days days"
 like "$got" "info.*has_pending_submission\\($package, $submit_target\\)$" "no output (old PR)"
 
-throttle_days=3
+throttle_days_leap_16=3
 try has_pending_submission "$package" "$submit_target"
-is "$rc" 1 "returns 1 with existing PR recent than throttle config of $throttle_days days"
+is "$rc" 1 "returns 1 with existing PR that is more recent than throttle config of $throttle_days days"
 like "$got" "info.*Skipping submission.*pending PR.*https://foo/bar" "expected output (recent PR)"
+
+_request_list() { echo "${_requests[@]}"; }
+submit_target=openSUSE:Backports:SLE-15-SP6:Update
+try has_pending_submission "$package" "$submit_target"
+is "$rc" 1 "returns 1 with existing maintenance incident that is more recent than throttle config of $throttle_days days"
+like "$got" "info.*Skipping submission.*pending SR"