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: force pyyaml reinstall in pygoat dockefile #9510

Merged
merged 4 commits into from
Jun 11, 2024

Conversation

juanjux
Copy link
Collaborator

@juanjux juanjux commented Jun 11, 2024

Checklist

  • Change(s) are motivated and described in the PR description
  • Testing strategy is described if automated tests are not included in the PR
  • Risks are described (performance impact, potential for breakage, maintainability)
  • Change is maintainable (easy to change, telemetry, documentation)
  • Library release note guidelines are followed or label changelog/no-changelog is set
  • Documentation is included (in-code, generated user docs, public corp docs)
  • Backport labels are set (if applicable)
  • If this PR changes the public interface, I've notified @DataDog/apm-tees.

Reviewer Checklist

  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Description motivates each change
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Change is maintainable (easy to change, telemetry, documentation)
  • Release note makes sense to a user of the library
  • Author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
@juanjux juanjux added changelog/no-changelog A changelog entry is not required for this PR. ASM Application Security Monitoring labels Jun 11, 2024
@juanjux juanjux self-assigned this Jun 11, 2024
@juanjux juanjux requested a review from a team as a code owner June 11, 2024 08:04
Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
Signed-off-by: Juanjo Alvarez <juanjo.alvarezmartinez@datadoghq.com>
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Jun 11, 2024

Datadog Report

Branch report: juanjux/force-pyyaml-reinstall-pygoat
Commit report: b26ac47
Test service: dd-trace-py

✅ 0 Failed, 1758 Passed, 2303 Skipped, 5m 2.27s Total duration (12m 14.64s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Jun 11, 2024

Benchmarks

Benchmark execution time: 2024-06-11 09:23:46

Comparing candidate commit b26ac47 in PR branch juanjux/force-pyyaml-reinstall-pygoat with baseline commit 360b469 in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 221 metrics, 9 unstable metrics.

@gnufede gnufede added the CI label Jun 11, 2024
@gnufede gnufede changed the title chore: force pyyaml reinstall in pygoat dockefile ci: force pyyaml reinstall in pygoat dockefile Jun 11, 2024
@juanjux juanjux merged commit 3ee94e9 into main Jun 11, 2024
80 of 84 checks passed
@juanjux juanjux deleted the juanjux/force-pyyaml-reinstall-pygoat branch June 11, 2024 10:13
Copy link
Contributor

The backport to 2.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport-9510-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3ee94e9057a0fc1266504576cc64b90811a656f1
# Push it to GitHub
git push --set-upstream origin backport-9510-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9

Then, create a pull request where the base branch is 2.9 and the compare/head branch is backport-9510-to-2.9.

gnufede pushed a commit that referenced this pull request Jun 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ASM Application Security Monitoring backport 2.9 changelog/no-changelog A changelog entry is not required for this PR. CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants