Skip to content
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

Use Windows VM until Azure ACI outage is resolved #898

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Use Windows VM until Azure ACI outage is resolved #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4ac41d
Use Windows VM until Azure ACI outage is resolved
MarkEWaite Jan 10, 2025
2cdf4f4
Adjust test for ACI outage workaround
MarkEWaite Jan 10, 2025
c7bc4da
Use better links
MarkEWaite Jan 10, 2025
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
7 changes: 6 additions & 1 deletion test/groovy/BuildPluginStepTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
4 changes: 4 additions & 0 deletions vars/buildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down