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.

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

CI: rpm: fix incorrect variable #31290

Merged
merged 1 commit into from
Nov 21, 2024
Merged

CI: rpm: fix incorrect variable #31290

merged 1 commit into from
Nov 21, 2024

Conversation

chouquette
Copy link
Contributor

What does this PR do?

Fix a build variable name

Motivation

DD_PRODUCT doesn't exist, DD_PROJECT does.
This has no functional change since the value was passed as empty, and in this case we default to 'agent'

Describe how to test/QA your changes

Possible Drawbacks / Trade-offs

Additional Notes

DD_PRODUCT doesn't exist, DD_PROJECT does.
This has no functional change since the value was passed as empty, and
in this case we default to 'agent'
@chouquette chouquette added changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation team/agent-delivery labels Nov 20, 2024
@chouquette chouquette requested a review from a team as a code owner November 20, 2024 19:33
@agent-platform-auto-pr
Copy link
Contributor

Gitlab CI Configuration Changes

Modified Jobs

agent_suse-arm64-a7
  agent_suse-arm64-a7:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $OMNIBUS_PACKAGE_DIR_SUSE
    before_script: null
    cache:
    - key:
        files:
        - omnibus/Gemfile
        - release.json
        prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
      paths:
      - omnibus/vendor/bundle
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/rpm_arm64$DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX:$DATADOG_AGENT_ARMBUILDIMAGES
    needs:
    - datadog-agent-7-arm64
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - echo "About to build for $RELEASE_VERSION"
    - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
    - printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_GPG_KEY)" | gpg --import
      --batch
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - RPM_SIGNING_PASSPHRASE=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_SIGNING_PASSPHRASE)
      || exit $?; export RPM_SIGNING_PASSPHRASE
    - inv -e omnibus.build --release-version "$RELEASE_VERSION" --major-version "$AGENT_MAJOR_VERSION"
      --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project=${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
    - ls -la $OMNIBUS_PACKAGE_DIR/
    - curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${DD_PKG_ARCH}.tar.gz"
      | tar -xz -C /usr/local/bin dd-pkg
    - find $OMNIBUS_PACKAGE_DIR -iregex '.*\.\(deb\|rpm\)' | xargs dd-pkg lint
    - "if [ -n \"$PACKAGE_REQUIRED_FILES_LIST\" ]; then\n  find $OMNIBUS_PACKAGE_DIR\
      \ \\( -name '*.deb' -or -name '*.rpm' \\) -a -not -name '*-dbg[_-]*' | xargs dd-pkg\
      \ check-files --required-files ${PACKAGE_REQUIRED_FILES_LIST}\nfi\n"
    - mkdir -p $OMNIBUS_PACKAGE_DIR_SUSE && mv $OMNIBUS_PACKAGE_DIR/*.rpm $OMNIBUS_PACKAGE_DIR_SUSE/
    stage: packaging
    tags:
    - arch:arm64
    variables:
      AGENT_MAJOR_VERSION: 7
      DD_PKG_ARCH: arm64
-     DD_PRODUCT: agent
?           ^^
+     DD_PROJECT: agent
?           ^^
      KUBERNETES_CPU_REQUEST: 16
      KUBERNETES_MEMORY_LIMIT: 32Gi
      KUBERNETES_MEMORY_REQUEST: 32Gi
      OMNIBUS_EXTRA_ARGS: --host-distribution=suse
      OMNIBUS_PACKAGE_ARTIFACT_DIR: $OMNIBUS_PACKAGE_DIR
      PACKAGE_ARCH: arm64
      PACKAGE_REQUIRED_FILES_LIST: test/required_files/agent-rpm.txt
      RELEASE_VERSION: $RELEASE_VERSION_7
agent_suse-x64-a7
  agent_suse-x64-a7:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $OMNIBUS_PACKAGE_DIR_SUSE
    before_script: null
    cache:
    - key:
        files:
        - omnibus/Gemfile
        - release.json
        prefix: omnibus-deps-$CI_JOB_NAME-$OMNIBUS_RUBY_VERSION-$OMNIBUS_SOFTWARE
      paths:
      - omnibus/vendor/bundle
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/rpm_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - datadog-agent-7-x64
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - echo "About to build for $RELEASE_VERSION"
    - pushd omnibus && bundle config set --local path 'vendor/bundle' && popd
    - printf -- "$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_GPG_KEY)" | gpg --import
      --batch
    - EXIT="${PIPESTATUS[0]}"; if [ $EXIT -ne 0 ]; then echo "Unable to locate credentials
      needs gitlab runner restart"; exit $EXIT; fi
    - RPM_SIGNING_PASSPHRASE=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $RPM_SIGNING_PASSPHRASE)
      || exit $?; export RPM_SIGNING_PASSPHRASE
    - inv -e omnibus.build --release-version "$RELEASE_VERSION" --major-version "$AGENT_MAJOR_VERSION"
      --base-dir $OMNIBUS_BASE_DIR --skip-deps --target-project=${DD_PROJECT} ${OMNIBUS_EXTRA_ARGS}
    - ls -la $OMNIBUS_PACKAGE_DIR/
    - curl -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${DD_PKG_ARCH}.tar.gz"
      | tar -xz -C /usr/local/bin dd-pkg
    - find $OMNIBUS_PACKAGE_DIR -iregex '.*\.\(deb\|rpm\)' | xargs dd-pkg lint
    - "if [ -n \"$PACKAGE_REQUIRED_FILES_LIST\" ]; then\n  find $OMNIBUS_PACKAGE_DIR\
      \ \\( -name '*.deb' -or -name '*.rpm' \\) -a -not -name '*-dbg[_-]*' | xargs dd-pkg\
      \ check-files --required-files ${PACKAGE_REQUIRED_FILES_LIST}\nfi\n"
    - mkdir -p $OMNIBUS_PACKAGE_DIR_SUSE && mv $OMNIBUS_PACKAGE_DIR/*.rpm $OMNIBUS_PACKAGE_DIR_SUSE/
    stage: packaging
    tags:
    - arch:amd64
    variables:
      AGENT_MAJOR_VERSION: 7
      DD_PKG_ARCH: x86_64
-     DD_PRODUCT: agent
?           ^^
+     DD_PROJECT: agent
?           ^^
      KUBERNETES_CPU_REQUEST: 16
      KUBERNETES_MEMORY_LIMIT: 32Gi
      KUBERNETES_MEMORY_REQUEST: 32Gi
      OMNIBUS_EXTRA_ARGS: --host-distribution=suse
      OMNIBUS_PACKAGE_ARTIFACT_DIR: $OMNIBUS_PACKAGE_DIR
      PACKAGE_ARCH: amd64
      PACKAGE_REQUIRED_FILES_LIST: test/required_files/agent-rpm.txt
      RELEASE_VERSION: $RELEASE_VERSION_7

Changes Summary

Removed Modified Added Renamed
0 2 0 0

ℹ️ Diff available in the job log.

@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Nov 20, 2024
@agent-platform-auto-pr
Copy link
Contributor

[Fast Unit Tests Report]

On pipeline 49538163 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_deb-arm64-py3
  • tests_deb-x64-py3
  • tests_flavor_dogstatsd_deb-x64
  • tests_flavor_heroku_deb-x64
  • tests_flavor_iot_deb-x64
  • tests_rpm-arm64-py3
  • tests_rpm-x64-py3
  • tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: ab190c44-fcad-464e-b833-1846d927007d

Baseline: 06fb514
Comparison: b1e7b18
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
file_tree memory utilization +0.81 [+0.67, +0.95] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.23 [-0.54, +1.00] 1 Logs
pycheck_lots_of_tags % cpu utilization +0.08 [-3.42, +3.57] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.05 [-0.80, +0.90] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.02 [-0.79, +0.82] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.01, +0.01] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.01 [-0.11, +0.08] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.03 [-0.77, +0.72] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.05 [-0.52, +0.41] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.12 [-0.74, +0.51] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.28 [-0.35, -0.22] 1 Logs
quality_gate_idle memory utilization -0.33 [-0.39, -0.26] 1 Logs bounds checks dashboard
basic_py_check % cpu utilization -0.74 [-4.49, +3.01] 1 Logs
otel_to_otel_logs ingress throughput -0.85 [-1.54, -0.17] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.96 [-1.69, -0.24] 1 Logs
quality_gate_idle_all_features memory utilization -2.48 [-2.60, -2.36] 1 Logs bounds checks dashboard

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_1000ms_latency lost_bytes 0/10
file_to_blackhole_300ms_latency lost_bytes 9/10
file_to_blackhole_500ms_latency lost_bytes 9/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_1000ms_latency_linear_load 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_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features 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:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. 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.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@chouquette
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 21, 2024

Devflow running: /merge

View all feedbacks in Devflow UI.


2024-11-21 08:22:53 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 25m.

@dd-mergequeue dd-mergequeue bot merged commit 5d0c2bc into main Nov 21, 2024
247 checks passed
@dd-mergequeue dd-mergequeue bot deleted the chouquette/fix_typo branch November 21, 2024 08:48
@github-actions github-actions bot added this to the 7.61.0 milestone Nov 21, 2024
Yumasi pushed a commit that referenced this pull request Nov 21, 2024
jack0x2 pushed a commit that referenced this pull request Nov 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation short review PR is simple enough to be reviewed quickly team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants