diff --git a/README.adoc b/README.adoc index 17db777d7..acfc2ecac 100644 --- a/README.adoc +++ b/README.adoc @@ -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 diff --git a/vars/buildPlugin.groovy b/vars/buildPlugin.groovy index 84060d302..888a379ff 100644 --- a/vars/buildPlugin.groovy +++ b/vars/buildPlugin.groovy @@ -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