Skip to content

Remove alt postfix in rpm assemble #1829

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

Conversation

peterzhuamazon
Copy link
Member

Signed-off-by: Peter Zhu [email protected]

Description

Remove alt postfix in rpm assemble

Issues Resolved

#1545

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Peter Zhu <[email protected]>
@peterzhuamazon peterzhuamazon requested a review from a team as a code owner March 25, 2022 00:40
@peterzhuamazon peterzhuamazon self-assigned this Mar 25, 2022
@peterzhuamazon peterzhuamazon requested a review from tianleh March 25, 2022 00:42
@tianleh
Copy link
Member

tianleh commented Mar 25, 2022

@tianleh
Copy link
Member

tianleh commented Mar 25, 2022

more context for the fix

2022-03-25 00:08:09 INFO     Execute rpmbuild -bb --define '_topdir /tmp/tmphb0_r3b0' --define '_version 1.3.0' --define '_architecture_alt aarch64' opensearch.rpm.spec in /tmp/tmphb0_r3b0
error: Architecture is not included: aarch64
Traceback (most recent call last):
  File "./src/run_assemble.py", line 58, in <module>
    sys.exit(main())
  File "./src/run_assemble.py", line 49, in main
    bundle.package(output_dir)
  File "/var/jenkins/workspace/Playground/tianleh-test/tianle-opensearch-build-3-22@2/src/assemble_workflow/bundle.py", line 102, in package
    self.min_dist.build(self.bundle_recorder.package_name, dest)
  File "/var/jenkins/workspace/Playground/tianleh-test/tianle-opensearch-build-3-22@2/src/assemble_workflow/dist.py", line 82, in build
    self.__build__(name, dest)
  File "/var/jenkins/workspace/Playground/tianleh-test/tianle-opensearch-build-3-22@2/src/assemble_workflow/dist.py", line 118, in __build__
    BundleRpm(self.filename, self.path, self.min_path).build(name, dest, self.archive_path, self.build_cls)
  File "/var/jenkins/workspace/Playground/tianleh-test/tianle-opensearch-build-3-22@2/src/assemble_workflow/bundle_rpm.py", line 108, in build
    subprocess.check_call(bundle_cmd, cwd=ext_dest, shell=True)
  File "/usr/local/lib/python3.7/subprocess.py", line 363, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command 'rpmbuild -bb --define '_topdir /tmp/tmphb0_r3b0' --define '_version 1.3.0' --define '_architecture_alt aarch64' opensearch.rpm.spec' returned non-zero exit status 1.

Signed-off-by: Peter Zhu <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Mar 25, 2022

Codecov Report

Merging #1829 (b6ad5ef) into main (c96aff0) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1829   +/-   ##
=========================================
  Coverage     94.53%   94.53%           
  Complexity       19       19           
=========================================
  Files           176      176           
  Lines          3622     3622           
  Branches         27       27           
=========================================
  Hits           3424     3424           
  Misses          194      194           
  Partials          4        4           
Impacted Files Coverage Δ
src/assemble_workflow/bundle_rpm.py 84.31% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c96aff0...b6ad5ef. Read the comment docs.

@peterzhuamazon peterzhuamazon merged commit c72e200 into opensearch-project:main Mar 25, 2022
@peterzhuamazon peterzhuamazon deleted the opensearch-assemble-rpm-arm64-2 branch March 25, 2022 01:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants