Skip to content

Commit

Permalink
Remove forceAci - all usages updated (#152)
Browse files Browse the repository at this point in the history
Co-authored-by: Tim Jacomb <timjacomb1+github@gmail.com>
  • Loading branch information
slide and timja committed Jul 27, 2020
1 parent 98fd6ef commit 6089fb6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ buildPlugin()

* `repo` (default: `null` inherit from Multibranch) - custom Git repository to check out
* `useAci` (default: `false`) - uses link:https://azure.microsoft.com/en-us/services/container-instances/[Azure Container Instances] for build instead of link:https://azure.microsoft.com/en-us/services/virtual-machines/[Azure Virtual Machines].
* `forceAci` (default: `false`) - forces usage of ACI (see `useAci` above) even on platforms that are not enabled when `useAci` is set to `true` (Windows).
* `failFast` (default: `true`) - instruct Maven tests to fail fast
* `platforms` (default: `['linux', 'windows']`) - Labels matching platforms to
execute the steps against in parallel
Expand Down
3 changes: 1 addition & 2 deletions vars/buildPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ def call(Map params = [:]) {
def repo = params.containsKey('repo') ? params.repo : null
def failFast = params.containsKey('failFast') ? params.failFast : true
def timeoutValue = params.containsKey('timeout') ? params.timeout : 60
def forceAci = params.containsKey('forceAci') ? params.forceAci : false
def useAci = params.containsKey('useAci') ? params.useAci : forceAci
def useAci = params.containsKey('useAci') ? params.useAci : false
if(timeoutValue > 180) {
echo "Timeout value requested was $timeoutValue, lowering to 180 to avoid Jenkins project's resource abusive consumption"
timeoutValue = 180
Expand Down

0 comments on commit 6089fb6

Please sign in to comment.