-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) #39241
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.
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
Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) #39241
Conversation
paulcacheux
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks !
Gitlab CI Configuration ChangesModified Jobstests_macos_gitlab_arm64 tests_macos_gitlab_arm64:
after_script:
- export VAULT_ADDR=https://vault.us1.ddbuild.io
- vault login -method=aws -no-print
- 'export PATH="$(pyenv root)/shims:$PATH"
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
'
- "if [ -n \"$PYTHON_VERSION\" ]; then\n # 1. Use PYTHON_VERSION if set\n if !\
\ [[ \"$PYTHON_VERSION\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then\n echo \"Invalid\
\ Python version format (should be X.Y.Z): $PYTHON_VERSION\" >& 2\n exit 1\n\
\ fi\n if ! [ -d \"$(pyenv root)/versions/$PYTHON_VERSION\" ]; then\n echo\
\ \"Python version $PYTHON_VERSION not found. Installing...\"\n pyenv install\
\ \"$PYTHON_VERSION\"\n fi\nelse\n # 2. Find appropriate python version from\
\ major version\n PYTHON_VERSION=\"$(cat .python-version)\"\n echo \"Find python\
\ version matching $PYTHON_VERSION\"\n PYTHON_VERSION_ESCAPED=\"${PYTHON_VERSION//./\\\
\\.}\"\n versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
\\.[0-9]+$\")\"\n if [ -n \"$versionmatches\" ]; then\n # 2.a.\n echo \"\
Found already existing python version for $PYTHON_VERSION\"\n else\n # 2.b.\n\
\ echo \"Installing Python $PYTHON_VERSION...\"\n pyenv install \"$PYTHON_VERSION\"\
\n versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
\\.[0-9]+$\")\"\n if [ -z \"$versionmatches\" ]; then\n echo \"No matching\
\ Python version found for $PYTHON_VERSION even after installation.\" >& 2\n \
\ exit 1\n fi\n fi\n # If there are multiple matches, select the latest\
\ one\n PYTHON_VERSION=\"$(echo \"$versionmatches\" | sort -V | tail -n 1)\"\n\
fi\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\nVENV_PATH=\"$(pyenv root)/versions/$VENV_NAME\"\
\n"
- echo "Using Python $PYTHON_VERSION..."
- "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
\ ]; then\n echo \"Creating virtual environment '$VENV_NAME'...\"\n pyenv virtualenv\
\ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n echo \"Virtual environment '$VENV_NAME'\
\ already exists. Skipping creation.\"\nfi\n"
- pyenv activate $VENV_NAME
- $CI_PROJECT_DIR/tools/ci/junit_upload.sh
- CODECOV_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $CODECOV token) || exit
$?; export CODECOV_TOKEN
- dda inv -- -e coverage.upload-to-codecov $COVERAGE_CACHE_FLAG || true
artifacts:
expire_in: 2 weeks
paths:
- $TEST_OUTPUT_FILE
- junit-*.tgz
reports:
annotations:
- $EXTERNAL_LINKS_PATH
junit:
- '**/junit-out-*.xml'
when: always
before_script:
- export VAULT_ADDR=https://vault.us1.ddbuild.io
- vault login -method=aws -no-print
- export AWS_RETRY_MODE=standard
- export AWS_RETRY_MAX_ATTEMPTS=5
- 'eval $(gimme $(cat .go-version))
export GOPATH=$GOROOT
'
- 'export PATH="$(pyenv root)/shims:$PATH"
eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)"
'
- "if [ -n \"$PYTHON_VERSION\" ]; then\n # 1. Use PYTHON_VERSION if set\n if !\
\ [[ \"$PYTHON_VERSION\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then\n echo \"Invalid\
\ Python version format (should be X.Y.Z): $PYTHON_VERSION\" >& 2\n exit 1\n\
\ fi\n if ! [ -d \"$(pyenv root)/versions/$PYTHON_VERSION\" ]; then\n echo\
\ \"Python version $PYTHON_VERSION not found. Installing...\"\n pyenv install\
\ \"$PYTHON_VERSION\"\n fi\nelse\n # 2. Find appropriate python version from\
\ major version\n PYTHON_VERSION=\"$(cat .python-version)\"\n echo \"Find python\
\ version matching $PYTHON_VERSION\"\n PYTHON_VERSION_ESCAPED=\"${PYTHON_VERSION//./\\\
\\.}\"\n versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
\\.[0-9]+$\")\"\n if [ -n \"$versionmatches\" ]; then\n # 2.a.\n echo \"\
Found already existing python version for $PYTHON_VERSION\"\n else\n # 2.b.\n\
\ echo \"Installing Python $PYTHON_VERSION...\"\n pyenv install \"$PYTHON_VERSION\"\
\n versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
\\.[0-9]+$\")\"\n if [ -z \"$versionmatches\" ]; then\n echo \"No matching\
\ Python version found for $PYTHON_VERSION even after installation.\" >& 2\n \
\ exit 1\n fi\n fi\n # If there are multiple matches, select the latest\
\ one\n PYTHON_VERSION=\"$(echo \"$versionmatches\" | sort -V | tail -n 1)\"\n\
fi\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\nVENV_PATH=\"$(pyenv root)/versions/$VENV_NAME\"\
\n"
- echo "Using Python $PYTHON_VERSION..."
- "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
\ ]; then\n echo \"Creating virtual environment '$VENV_NAME'...\"\n pyenv virtualenv\
\ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n echo \"Virtual environment '$VENV_NAME'\
\ already exists. Skipping creation.\"\nfi\n"
- pyenv activate $VENV_NAME
- python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
.dda/version)" --break-system-packages
- pyenv rehash
- python3 -m dda self dep sync -f legacy-tasks
- pyenv rehash
- DD_API_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_API_KEY_ORG2"
token)" || exit $?; export DD_API_KEY
- DD_APP_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_APP_KEY_ORG2"
token)" || exit $?; export DD_APP_KEY
- "if [ \"$CI_COMMIT_BRANCH\" = \"main\" ] || [[ \"$CI_COMMIT_BRANCH\" =~ ^[0-9]+\\\
.[0-9]+\\.(x|[0-9]+)$ ]]; then\n dda inv -- -e macos.report-versions -l all ||\
\ true\nfi\n"
- "if [ \"$((RANDOM%20))\" -eq 0 ]; then\n echo Trying to remove inactive versions\n\
\ dda inv -- -e macos.remove-inactive-versions -l python -t \"$PYTHON_VERSION\"\
\ || true\n dda inv -- -e macos.remove-inactive-versions -l go -t \"$(cat .go-version)\"\
\ || true\nfi\n"
- dda inv -- -e rtloader.make
- dda inv -- -e rtloader.install
- dda inv -- -e install-tools
needs:
- go_deps
- go_tools_deps
rules:
+ - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
+ when: never
- if: $RUN_UNIT_TESTS == "off"
when: never
- if: $CI_COMMIT_BRANCH == "main"
variables:
COVERAGE_CACHE_FLAG: --push-coverage-cache
FAST_TESTS: 'false'
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
variables:
COVERAGE_CACHE_FLAG: ''
FAST_TESTS: 'false'
- if: $CI_COMMIT_TAG != null
variables:
COVERAGE_CACHE_FLAG: ''
FAST_TESTS: 'false'
- if: $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "pipeline"
variables:
COVERAGE_CACHE_FLAG: ''
FAST_TESTS: 'false'
- if: $RUN_UNIT_TESTS == "on"
variables:
COVERAGE_CACHE_FLAG: ''
FAST_TESTS: 'false'
- variables:
COVERAGE_CACHE_FLAG: --pull-coverage-cache
FAST_TESTS: 'true'
script:
- mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
|| exit 101
- rm -f modcache.tar.xz
- mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
|| exit 101
- rm -f modcache_tools.tar.xz
- dda inv -- -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
- FAST_TESTS_FLAG=""
- if [[ "$FAST_TESTS" == "true" ]]; then FAST_TESTS_FLAG="--only-impacted-packages";
fi
- dda inv -- -e test --rerun-fails=2 --race --profile --cpus 12 --result-json $TEST_OUTPUT_FILE
--junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer --coverage
- dda inv -- -e invoke-unit-tests
stage: source_test
tags:
- macos:ventura-arm64
- specific:true
variables:
FLAKY_PATTERNS_CONFIG: $CI_PROJECT_DIR/flaky-patterns-runtime.yaml
TEST_OUTPUT_FILE: test_output.jsonChanges Summary
ℹ️ Diff available in the job log. |
Regression DetectorRegression Detector ResultsMetrics dashboard Baseline: a980511 Optimization Goals: ✅ No significant changes detected
|
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | docker_containers_cpu | % cpu utilization | +2.19 | [-0.95, +5.33] | 1 | Logs |
Fine details of change detection per experiment
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | quality_gate_logs | % cpu utilization | +4.04 | [+1.20, +6.88] | 1 | Logs bounds checks dashboard |
| ➖ | docker_containers_cpu | % cpu utilization | +2.19 | [-0.95, +5.33] | 1 | Logs |
| ➖ | quality_gate_metrics_logs | memory utilization | +2.06 | [+1.67, +2.46] | 1 | Logs bounds checks dashboard |
| ➖ | otlp_ingest_metrics | memory utilization | +0.36 | [+0.21, +0.50] | 1 | Logs |
| ➖ | docker_containers_memory | memory utilization | +0.20 | [+0.13, +0.26] | 1 | Logs |
| ➖ | file_to_blackhole_500ms_latency | egress throughput | +0.13 | [-0.50, +0.76] | 1 | Logs |
| ➖ | file_to_blackhole_100ms_latency | egress throughput | +0.05 | [-0.56, +0.67] | 1 | Logs |
| ➖ | file_to_blackhole_1000ms_latency | egress throughput | +0.04 | [-0.58, +0.66] | 1 | Logs |
| ➖ | file_to_blackhole_0ms_latency | egress throughput | -0.00 | [-0.58, +0.57] | 1 | Logs |
| ➖ | tcp_dd_logs_filter_exclude | ingress throughput | -0.00 | [-0.02, +0.02] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api | ingress throughput | -0.00 | [-0.30, +0.29] | 1 | Logs |
| ➖ | quality_gate_idle_all_features | memory utilization | -0.03 | [-0.07, +0.00] | 1 | Logs bounds checks dashboard |
| ➖ | ddot_logs | memory utilization | -0.08 | [-0.17, +0.02] | 1 | Logs |
| ➖ | file_tree | memory utilization | -0.08 | [-0.12, -0.04] | 1 | Logs |
| ➖ | quality_gate_idle | memory utilization | -0.27 | [-0.34, -0.19] | 1 | Logs bounds checks dashboard |
| ➖ | uds_dogstatsd_20mb_12k_contexts_20_senders | memory utilization | -0.31 | [-0.35, -0.27] | 1 | Logs |
| ➖ | tcp_syslog_to_blackhole | ingress throughput | -0.31 | [-0.37, -0.25] | 1 | Logs |
| ➖ | otlp_ingest_logs | memory utilization | -0.31 | [-0.43, -0.19] | 1 | Logs |
| ➖ | ddot_metrics | memory utilization | -0.35 | [-0.46, -0.23] | 1 | Logs |
Bounds Checks: ✅ Passed
| perf | experiment | bounds_check_name | replicates_passed | links |
|---|---|---|---|---|
| ✅ | docker_containers_cpu | simple_check_run | 10/10 | |
| ✅ | docker_containers_memory | memory_usage | 10/10 | |
| ✅ | docker_containers_memory | simple_check_run | 10/10 | |
| ✅ | file_to_blackhole_0ms_latency | lost_bytes | 10/10 | |
| ✅ | file_to_blackhole_0ms_latency | memory_usage | 10/10 | |
| ✅ | file_to_blackhole_1000ms_latency | memory_usage | 10/10 | |
| ✅ | file_to_blackhole_100ms_latency | lost_bytes | 10/10 | |
| ✅ | file_to_blackhole_100ms_latency | memory_usage | 10/10 | |
| ✅ | file_to_blackhole_500ms_latency | lost_bytes | 10/10 | |
| ✅ | file_to_blackhole_500ms_latency | memory_usage | 10/10 | |
| ✅ | quality_gate_idle | intake_connections | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_idle | memory_usage | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_idle_all_features | intake_connections | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_idle_all_features | memory_usage | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_logs | intake_connections | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_logs | lost_bytes | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_logs | memory_usage | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_metrics_logs | cpu_usage | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_metrics_logs | intake_connections | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_metrics_logs | lost_bytes | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_metrics_logs | memory_usage | 10/10 | bounds checks dashboard |
Explanation
Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%
Performance changes are noted in the perf column of each table:
- ✅ = significantly better comparison variant performance
- ❌ = significantly worse comparison variant performance
- ➖ = no significant change in performance
A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".
For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:
-
Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
-
Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.
-
Its configuration does not mark it "erratic".
CI Pass/Fail Decision
✅ Passed. All Quality Gates passed.
- quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
- quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
- quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
- quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
- quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
- quality_gate_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
- quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
- quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
- quality_gate_metrics_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
- quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
- quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
Static quality checks✅ Please find below the results from static quality gates Successful checksInfo
|
.gitlab/package_build/dmg.yml
Outdated
| - !reference [.on_all_builds] | ||
| - !reference [.manual] | ||
| #TODO(regis): remove below line once enough `macos:ventura-arm64` runners are provisioned | ||
| - !reference [.except_mergequeue] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you put this rule on top, as the first match is the most important
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @chouetz, I took your comment into consideration when moving the workaround from the build to the test job.
This is to be undone once enough `macos:ventura-arm64` runners are provisioned.
a91fbd0 to
1752068
Compare
…ue (ABLD-28 follow-up) (#39241)" There are now 5 times more `macos:ventura-arm64` runners available (25), so we should be good to go without much contention, see dashboard: https://app.datadoghq.com/dashboard/5ki-mv5-w74/ci-execution-gitlab-runner-macos?fromUser=false&fullscreen_end_ts=1753430506180&fullscreen_paused=false&fullscreen_refresh_mode=sliding&fullscreen_start_ts=1753416106180&fullscreen_widget=2004175550845916&refresh_mode=paused&tile_focus=2004175550845916&tpl_var_ci-project-name%5B0%5D=datadog-agent&tpl_var_runner_type%5B0%5D=macos%3Aventura-arm64_specific%3Atrue&from_ts=1753345825972&to_ts=1753360225972&live=false This reverts commit 666ad9d.
This reverts "Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) (#39241)", commit 666ad9d. There are now 5 times more `macos:ventura-arm64` runners available (25), so we should be good to go without much contention, see dashboard: https://app.datadoghq.com/dashboard/5ki-mv5-w74/ci-execution-gitlab-runner-macos?fromUser=false&fullscreen_end_ts=1753430506180&fullscreen_paused=false&fullscreen_refresh_mode=sliding&fullscreen_start_ts=1753416106180&fullscreen_widget=2004175550845916&refresh_mode=paused&tile_focus=2004175550845916&tpl_var_ci-project-name%5B0%5D=datadog-agent&tpl_var_runner_type%5B0%5D=macos%3Aventura-arm64_specific%3Atrue&from_ts=1753345825972&to_ts=1753360225972&live=false
…up) (#39260) This reverts "Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) (#39241)", commit 666ad9d. There are now 5 times more `macos:ventura-arm64` runners available (25), so we should be good to go without much contention, see corresponding [queue time dashboard](https://app.datadoghq.com/dashboard/5ki-mv5-w74/ci-execution-gitlab-runner-macos?fromUser=false&fullscreen_end_ts=1753430506180&fullscreen_paused=false&fullscreen_refresh_mode=sliding&fullscreen_start_ts=1753416106180&fullscreen_widget=2004175550845916&refresh_mode=paused&tile_focus=2004175550845916&tpl_var_ci-project-name%5B0%5D=datadog-agent&tpl_var_runner_type%5B0%5D=macos%3Aventura-arm64_specific%3Atrue&from_ts=1753345825972&to_ts=1753360225972&live=false).
…up) (#39260) This reverts "Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) (#39241)", commit 666ad9d. There are now 5 times more `macos:ventura-arm64` runners available (25), so we should be good to go without much contention, see corresponding [queue time dashboard](https://app.datadoghq.com/dashboard/5ki-mv5-w74/ci-execution-gitlab-runner-macos?fromUser=false&fullscreen_end_ts=1753430506180&fullscreen_paused=false&fullscreen_refresh_mode=sliding&fullscreen_start_ts=1753416106180&fullscreen_widget=2004175550845916&refresh_mode=paused&tile_focus=2004175550845916&tpl_var_ci-project-name%5B0%5D=datadog-agent&tpl_var_runner_type%5B0%5D=macos%3Aventura-arm64_specific%3Atrue&from_ts=1753345825972&to_ts=1753360225972&live=false).
…up) (#39260) This reverts "Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) (#39241)", commit 666ad9d. There are now 5 times more `macos:ventura-arm64` runners available (25), so we should be good to go without much contention, see corresponding [queue time dashboard](https://app.datadoghq.com/dashboard/5ki-mv5-w74/ci-execution-gitlab-runner-macos?fromUser=false&fullscreen_end_ts=1753430506180&fullscreen_paused=false&fullscreen_refresh_mode=sliding&fullscreen_start_ts=1753416106180&fullscreen_widget=2004175550845916&refresh_mode=paused&tile_focus=2004175550845916&tpl_var_ci-project-name%5B0%5D=datadog-agent&tpl_var_runner_type%5B0%5D=macos%3Aventura-arm64_specific%3Atrue&from_ts=1753345825972&to_ts=1753360225972&live=false).
Motivation
Since #37676 got merged, jobs on
macos:ventura-arm64started queuing for 20+ minutes prior to start - or timing out.Possible Drawbacks / Trade-offs
This is to be undone once enough
macos:ventura-arm64runners are provisioned, see: https://app.datadoghq.com/s/yB5yjZ/zdt-veh-nzp