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.

Sign up for GitHub

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

Fix the bundle_artifact_path value and remove wrong comments for deb assemble #4673

Merged
merged 1 commit into from
May 2, 2024
Merged

Fix the bundle_artifact_path value and remove wrong comments for deb assemble #4673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/assemble_workflow/bundle_linux_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def build(self, name: str, dest: str, archive_path: str, build_cls: BuildManifes
subprocess.check_call(bundle_cmd, cwd=ext_dest, shell=True)

# Move artifact to repo root before being published to {dest}
# for dirpath, dirnames, filenames in os.walk(os.path.join('/tmp/opensearch*')):
# In debuild, the final package is created in the parent directory of the sources
# https://github.com/opensearch-project/opensearch-build/issues/4532#issuecomment-2091726868
bundle_artifact_path = f"/tmp/{self.filename}_{deb_version}_{deb_architecture(build_cls.architecture)}.deb"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this path the same as before?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is same, but in previous implementation the var bundle_artifact_path is missing assignment other than None, resulted in:

2024-03-14 17:05:15 INFO     Found deb file: None

Now:

2024-05-02 21:50:15 INFO     Found deb file: /tmp/opensearch_2.14.0_amd64.deb

Thanks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense. I see it doesn't assign any value after line 100. Thanks @peterzhuamazon

logging.info(f"Found deb file: {bundle_artifact_path}")
shutil.move(f"/tmp/{self.filename}_{deb_version}_{deb_architecture(build_cls.architecture)}.deb", name)
shutil.move(bundle_artifact_path, name)
Loading