Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .gitlab/bazel/defs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
extends: .linux_arm64

.bazel:runner:macos-amd64:
tags: [ "macos:ventura-amd64", "specific:true" ]
tags: [ "macos:sonoma-amd64", "specific:true" ]

.bazel:runner:macos-arm64:
tags: [ "macos:ventura-arm64", "specific:true" ]
tags: [ "macos:sonoma-arm64", "specific:true" ]

.bazel:runner:windows-amd64:
extends: .windows_docker_default
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/lint/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ include:

lint_macos_gitlab_amd64:
extends: .lint_macos_gitlab
tags: ["macos:ventura-amd64", "specific:true"]
tags: ["macos:sonoma-amd64", "specific:true"]

lint_macos_gitlab_arm64:
extends: .lint_macos_gitlab
tags: ["macos:ventura-arm64", "specific:true"]
tags: ["macos:sonoma-arm64", "specific:true"]
4 changes: 2 additions & 2 deletions .gitlab/package_build/dmg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@

agent_dmg-x64-a7:
extends: .agent_dmg
tags: ["macos:ventura-amd64", "specific:true"]
tags: ["macos:sonoma-amd64", "specific:true"]

agent_dmg-arm64-a7:
extends: .agent_dmg
tags: ["macos:ventura-arm64", "specific:true"]
tags: ["macos:sonoma-arm64", "specific:true"]
6 changes: 5 additions & 1 deletion .gitlab/source_test/kmt_tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
rules:
- !reference [.on_invoke_tasks_changes]
- !reference [.except_mergequeue]
- changes:
paths:
- .gitlab/source_test/kmt_tasks.yml
compare_to: $COMPARE_TO_BRANCH
script:
- git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "[email protected]:"
# Avoid rate limits when running kmt.init (pulumi queries the Github API to get the releases of plugins)
Expand All @@ -32,7 +36,7 @@ test_kmt_local_setup_macos:
extends: .test_kmt_local_setup
before_script:
- !reference [.macos_gitlab, before_script]
tags: ["macos:ventura-amd64", "specific:true"]
tags: ["macos:sonoma-amd64", "specific:true"]
variables:
# Some requirements cannot be tested in the CI yet:
# - Docker,Compiler,UserInDockerGroup: no docker-in-docker support in these jobs yet
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/source_test/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ include:

tests_macos_gitlab_amd64:
extends: .tests_macos_gitlab
tags: ["macos:ventura-amd64", "specific:true"]
tags: ["macos:sonoma-amd64", "specific:true"]

tests_macos_gitlab_arm64:
extends: .tests_macos_gitlab
tags: ["macos:ventura-arm64", "specific:true"]
tags: ["macos:sonoma-arm64", "specific:true"]