Skip to content

Commit

Permalink
Merge branch 'NoPort' into 'master'
Browse files Browse the repository at this point in the history
Jenkinsfile#port no longer needed, because docker allows reusing ports

See merge request exedio/copeconsole!103
  • Loading branch information
rw7 committed Sep 16, 2024
2 parents d90ec02 + 901ca2b commit 94575fa
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ try
' "-Dbuild.tag=' + buildTag + '"' +
' -Dbuild.status=' + (isRelease?'release':'integration') +
' -Dinstrument.verify=true' +
' -Dtomcat.port.shutdown=' + port(0) +
' -Dtomcat.port.http=' + port(1)
' -Dtomcat.port.shutdown=18005' +
' -Dtomcat.port.http=18080'
}

recordIssues(
Expand Down Expand Up @@ -296,8 +296,3 @@ void assertGitUnchanged()
error 'FAILURE because fetching dependencies produces git diff:\n' + gitStatus
}
}

def port(int offset)
{
return 28000 + 10*env.EXECUTOR_NUMBER.toInteger() + offset
}

0 comments on commit 94575fa

Please sign in to comment.