Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/test-dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -ex

cd "$(dirname "$0")"
./system-dependencies.sh --ignore-xamarin-studio --ignore-xcode --ignore-osx --ignore-dotnet --ignore-shellcheck --ignore-yamllint --ignore-old-simulators --ignore-xcode-components
./system-dependencies.sh --ignore-xamarin-studio --ignore-xcode --ignore-osx --ignore-dotnet --ignore-shellcheck --ignore-yamllint --ignore-old-simulators --ignore-xcode-components --ignore-python3
2 changes: 1 addition & 1 deletion tools/devops/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ run-post-pr-build-tests.yml ─────────────────
│ └─► templates/build/build-mac-tests.yml │
│ └─► templates/build/build.yml (test build variant) │
│ │
├─► Stage: mac_12_m1, mac_13_m1, mac_14_x64, mac_15_arm64, mac_26_arm64
├─► Stage: mac_14_x64, mac_15_arm64, mac_26_arm64, mac_27_arm64 │
│ └─► templates/mac/stage.yml (for each config) │
│ └─► Job: run_tests │
│ └─► templates/mac/build.yml │
Expand Down
8 changes: 8 additions & 0 deletions tools/devops/automation/templates/common/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ parameters:
testStage: 'mac_26_arm64',
isMacTest: true,
},
{
label: mac_golden_gate,
displayName: 'Tests on macOS Golden Gate (27)',
splitByPlatforms: false,
testPrefix: 'mac_27_arm64',
testStage: 'mac_27_arm64',
isMacTest: true,
},
]

# Note that this is _all_ the platforms we support (not just the enabled ones).
Expand Down
10 changes: 9 additions & 1 deletion tools/devops/automation/templates/mac/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,21 @@ steps:

displayName: 'Set VM Vendor'

# provision-brew-packages.csx does '#load "provision-shared.csx"', and provision-shared.csx
# is generated (it's git-ignored) from provision-shared.in.csx by the 'provisioning' make target.
# Every other common/provision.yml caller (build, simulator tests, windows reserve-mac) generates
# it first, so do the same here or the provisionator step fails with 'provision-shared.csx could
# not be opened'.
- bash: |
make -C $(Build.SourcesDirectory)/$(BUILD_REPOSITORY_TITLE)/tools/devops provisioning
displayName: 'Generate Provisionator csx file'

- template: ../common/provision.yml
parameters:
provisioning_script: $(Build.SourcesDirectory)/$(BUILD_REPOSITORY_TITLE)/tools/devops/provision-brew-packages.csx
displayName: 'Provision Brew components'
provisionatorChannel: $(PROVISIONATOR_CHANNEL)
timeoutInMinutes: 30
enabled: false

- bash: |
sudo rm -Rf $(Build.SourcesDirectory)/package
Expand Down
8 changes: 8 additions & 0 deletions tools/devops/automation/templates/mac/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ parameters:
type: string
default: ''

# When set (e.g. 'ACES' for VM-based pools), exposes VM_VENDOR so tests gated by
# TestRuntime.AssertNotVirtualMachine are ignored, matching the simulator ACES path.
- name: vmVendor
type: string
default: ''


stages:

Expand Down Expand Up @@ -78,6 +84,8 @@ stages:

variables:
PR_ID: $[ stageDependencies.configure_build.configure.outputs['labels.pr_number'] ]
${{ if parameters.vmVendor }}:
VM_VENDOR: ${{ parameters.vmVendor }}

steps:
- template: build.yml
Expand Down
13 changes: 13 additions & 0 deletions tools/devops/automation/templates/tests-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ parameters:
"Agent.HasDevices -equals False",
"Agent.IsPaired -equals False"
]
},
{
stageName: 'mac_27_arm64',
displayName: 'arm64 - Mac Golden Gate (27)',
label: 'mac_golden_gate',
macPool: 'AcesShared',
useImage: false,
statusContext: 'arm64 - Mac Golden Gate (27)',
vmVendor: 'ACES',
demands: [
"ImageOverride -equals ACES_VM_SharedPool_GoldenGate_Beta"
]
}]

- name: stageDisplayNamePrefix
Expand Down Expand Up @@ -275,3 +287,4 @@ stages:
xqaCertPass: $(xqa--certificates--password)
postPipeline: ${{ not(parameters.buildPackages) }}
label: ${{ config.label }}
vmVendor: ${{ config.vmVendor }}
1 change: 1 addition & 0 deletions tools/devops/provision-shared.in.csx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ void ProvisionBrewPackages ()
"shellcheck",
"yamllint",
"p7zip",
"python3",
"azure-cli"
);
}
Expand Down
Loading