Skip to content

CI: kill leaf jobs when aborting stale PR dispatchers #11491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Alexey-Rivkin wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CI: kill leaf jobs when aborting stale PR dispatchers #11491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 32 additions & 7 deletions .ci/jenkins/proj_jjb_oss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,48 @@
githubHelper = GithubHelper.getInstance("${{GIT_PASSWORD}}", VARIABLE_FROM_POST)
}}

// Abort previous dispatcher runs for the same PR
// Abort previous dispatcher runs for the same PR and their leaf jobs
def currentPrNumber = githubHelper.getPRNumber()?.toString()
if (currentPrNumber) {{
def slurper = new groovy.json.JsonSlurper()
try {{
Jenkins.instance.getItemByFullName(env.JOB_NAME).builds.findAll {{
def staleBuilds = Jenkins.instance.getItemByFullName(env.JOB_NAME).builds.findAll {{
it.isBuilding() && it.number < currentBuild.number
}}.each {{ b ->
}}.findAll {{ b ->
def gd = b.getAction(hudson.model.ParametersAction)?.getParameters()?.find {{ it.name == 'VARIABLE_FROM_POST' }}?.value
def otherPr = gd ? slurper.parseText(gd)?.issue?.number?.toString() : null
if (otherPr == currentPrNumber) {{
echo "Aborting dispatcher #${{b.number}} for same PR #${{currentPrNumber}}"
b.doStop()
otherPr == currentPrNumber
}}

if (staleBuilds) {{
echo "PR #${{currentPrNumber}}: found ${{staleBuilds.size()}} stale dispatcher(s) to abort"
}}

// Collect leaf builds from each stale dispatcher's console log
def leafBuilds = []
staleBuilds.each {{ b ->
b.getLog(1000).each {{ line ->
def m = (line =~ /Starting building: (\S+) #(\d+)/)
if (m) {{
def child = Jenkins.instance.getItemByFullName(m[0][1])?.getBuildByNumber(m[0][2] as int)
if (child) leafBuilds.add(child)
}}
}}
}}

// Kill leaf jobs first (unblocks dispatcher), then dispatchers
def allTargets = leafBuilds + staleBuilds
for (int attempt = 1; attempt <= 3; attempt++) {{
def alive = allTargets.findAll {{ it.isBuilding() }}
if (!alive) break
alive.each {{ target ->
echo "${{attempt > 1 ? 'Retry ' + attempt + ': ' : ''}}Killing ${{target.fullDisplayName}}"
target.doKill()
}}
if (attempt < 3) sleep 5
}}
}} catch(Exception e) {{
echo "Could not abort previous dispatchers: ${{e.message}}"
echo "Could not abort previous builds: ${{e.message}}"
}}
}}

Expand Down