Skip to content

[8.x](backport #5647) Include python wheel packages when moving downloaded dependencies archives#5649

Closed
mergify[bot] wants to merge 1 commit into8.xfrom
mergify/bp/8.x/pr-5647
Closed

[8.x](backport #5647) Include python wheel packages when moving downloaded dependencies archives#5649
mergify[bot] wants to merge 1 commit into8.xfrom
mergify/bp/8.x/pr-5647

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2024

What does this PR do?

This commit modifies movePackagesToArchive() function to include python wheel packages introduced with commit 701f8b9 .
This solves an issue when packaging docker images using a DROP_PATH env var: prior to this change, the python wheel archives present in DROP_PATH were not moved to <DROP PATH>/archive/<platform> failing to create an image for which the Dockerfile expects to install the python wheel package

Why is it important?

To have a successful docker image creation during unified build processes.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Package the docker image "service" for elastic agent using a DROP_PATH (and optionally a manifest), for example:

AGENT_DROP_PATH=./build/agentdrop MANIFEST_URL=https://snapshots.elastic.co/9.0.0-3ca48ed8/agent-package/agent-artifacts-9.0.0-SNAPSHOT.json SNAPSHOT=true PLATFORMS="linux/amd64" PACKAGES="docker" DOCKER_VARIANT="service" mage -v downloadManifest packageUsingDRA

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #5647 done by [Mergify](https://mergify.com).

…hives (#5647)

This commit modifies movePackagesToArchive() function to include python
wheel packages introduced with commit 701f8b9 .
This solves an issue when packaging docker images using a DROP_PATH env
var: prior to this change, the python wheel archives present in
DROP_PATH were not moved to `<DROP PATH>/archive/<platform>` failing to
create an image for which the Dockerfile expects to install the python
wheel package

(cherry picked from commit 23621df)

# Conflicts:
#	magefile.go
@mergify mergify bot requested a review from a team as a code owner October 1, 2024 14:50
@mergify mergify bot requested review from andrzej-stencel and pkoutsovasilis and removed request for a team October 1, 2024 14:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 1, 2024
@mergify mergify bot assigned pchila Oct 1, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 1, 2024

Cherry-pick of 23621df has failed:

On branch mergify/bp/8.x/pr-5647
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 23621df5ee.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   magefile.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@blakerouse
Copy link
Contributor

Closing backport PR as I have merged this changed into this backport PR - #5634

@blakerouse blakerouse closed this Oct 1, 2024
@v1v v1v deleted the mergify/bp/8.x/pr-5647 branch July 24, 2025 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants