Skip to content

Commit c72e200

Browse files
Remove alt postfix in rpm assemble (#1829)
* Remove alt postfix Signed-off-by: Peter Zhu <[email protected]> * fix unittest Signed-off-by: Peter Zhu <[email protected]>
1 parent c96aff0 commit c72e200

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/assemble_workflow/bundle_rpm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def build(self, name: str, dest: str, archive_path: str, build_cls: BuildManifes
9999
'-bb',
100100
f"--define '_topdir {ext_dest}'",
101101
f"--define '_version {build_cls.version}'",
102-
f"--define '_architecture_alt {rpm_architecture(build_cls.architecture)}'",
102+
f"--define '_architecture {rpm_architecture(build_cls.architecture)}'",
103103
f"{self.filename}.rpm.spec",
104104
]
105105
)

tests/tests_assemble_workflow/test_bundle_rpm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ def test_build_rpm(self, check_call_mock: Mock, shutil_move_mock: Mock, builtins
5252

5353
self.assertRaises(KeyError, lambda: os.environ['OPENSEARCH_PATH_CONF'])
5454
self.assertEqual(check_call_mock.call_count, 1)
55-
self.assertEqual(f"rpmbuild -bb --define '_topdir {self.artifacts_path}' --define '_version 1.3.0' --define '_architecture_alt x86_64' opensearch.rpm.spec", args_list[0][0][0])
55+
self.assertEqual(f"rpmbuild -bb --define '_topdir {self.artifacts_path}' --define '_version 1.3.0' --define '_architecture x86_64' opensearch.rpm.spec", args_list[0][0][0])
5656
self.assertEqual(shutil_move_mock.call_count, 3)

0 commit comments

Comments
 (0)