switch back to Azure-provided macos nodes (#5920)

This is temporary. It looks like the macOS nodes are dead; @nycnewman is
looking into it, but in case he doesn't fix it in time, at least we
have a backup plan so we're not completely blocked on Monday.

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Gary Verhaegen 2020-05-11 09:28:40 +02:00 committed by GitHub
parent 4a6ab84b69
commit 9b476416b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 9 deletions

View File

@ -124,7 +124,7 @@ jobs:
- check_for_release - check_for_release
timeoutInMinutes: 360 timeoutInMinutes: 360
pool: pool:
name: 'macOS-pool' vmImage: macOS-10.14
variables: variables:
release_sha: $[ dependencies.check_for_release.outputs['out.release_sha'] ] release_sha: $[ dependencies.check_for_release.outputs['out.release_sha'] ]
release_tag: $[ coalesce(dependencies.check_for_release.outputs['out.release_tag'], '0.0.0') ] release_tag: $[ coalesce(dependencies.check_for_release.outputs['out.release_tag'], '0.0.0') ]
@ -205,7 +205,7 @@ jobs:
- check_for_release - check_for_release
timeoutInMinutes: 60 timeoutInMinutes: 60
pool: pool:
name: macos-pool vmImage: macOS-10.14
steps: steps:
- template: ci/report-start.yml - template: ci/report-start.yml
- checkout: self - checkout: self

View File

@ -25,14 +25,8 @@ schedules:
jobs: jobs:
- job: compatibility - job: compatibility
timeoutInMinutes: 240 timeoutInMinutes: 240
strategy:
matrix:
linux:
pool: 'linux-pool'
macos:
pool: 'macOS-pool'
pool: pool:
name: $(pool) name: linux-pool
steps: steps:
- checkout: self - checkout: self
- template: ../compatibility.yml - template: ../compatibility.yml
@ -52,6 +46,31 @@ jobs:
$(Slack.team-daml) $(Slack.team-daml)
displayName: report displayName: report
condition: always() condition: always()
- job: compatibility
timeoutInMinutes: 240
pool:
vmImage: macos-10.14
steps:
- checkout: self
- template: ../compatibility.yml
- bash: |
set -euo pipefail
COMMIT_TITLE=$(git log --pretty=format:%s -n1)
COMMIT_LINK="<https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|$COMMIT_TITLE>"
if [ "$(Agent.JobStatus)" != "Succeeded" ]; then
MESSAGE=":fire: <!here> :fire: :fire:\n$(Agent.JobName) *FAILED*: $COMMIT_LINK\n:fire: :fire:"
else
MESSAGE="$(Agent.JobName) passed: $COMMIT_LINK"
fi
curl -XPOST \
-i \
-H 'Content-type: application/json' \
--data "{\"text\":\"$MESSAGE\n\"}" \
$(Slack.team-daml)
displayName: report
condition: always()
- job: compatibility_windows - job: compatibility_windows
timeoutInMinutes: 240 timeoutInMinutes: 240
pool: pool: