diff --git a/test/groovy/BuildPluginStepTests.groovy b/test/groovy/BuildPluginStepTests.groovy index 28fc353e..ea6e2e64 100644 --- a/test/groovy/BuildPluginStepTests.groovy +++ b/test/groovy/BuildPluginStepTests.groovy @@ -144,7 +144,12 @@ class BuildPluginStepTests extends BaseTest { // then it runs a stage in a linux container by default assertTrue(assertMethodCallContainsPattern('node', 'maven')) // then it runs a stage in a Windows container by default - assertTrue(assertMethodCallContainsPattern('node', 'maven-windows')) + // TODO: Restore this assertion when ACI outage is resolved + // https://github.com/jenkins-infra/helpdesk/issues/4490 + // assertTrue(assertMethodCallContainsPattern('node', 'maven-windows')) + // TODO: Delete this assertion when ACI outage is resolved + // https://github.com/jenkins-infra/helpdesk/issues/4490 + assertTrue(assertMethodCallContainsPattern('node', 'docker-windows')) assertJobStatusSuccess() } diff --git a/vars/buildPlugin.groovy b/vars/buildPlugin.groovy index 05ad326d..602711bd 100644 --- a/vars/buildPlugin.groovy +++ b/vars/buildPlugin.groovy @@ -43,6 +43,10 @@ def call(Map params = [:]) { def agentContainerLabel = jdk == '8' ? 'maven' : 'maven-' + jdk if (platform == 'windows') { agentContainerLabel += '-windows' + // TODO: Remove when Azure Container (ACI) outage is resolved + // https://github.com/jenkins-infra/helpdesk/issues/4490 + echo "Using Windows virtual machines during Azure ACI outage https://status.jenkins.io/issues/2025-01-08-ci.jenkins.io-azure-outage/" + agentContainerLabel = 'docker-windows' } label = agentContainerLabel }