From 6b46c5d2b2825d6a1e60195e8a76e9a195c0e647 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Fri, 12 Aug 2022 15:22:33 +0300 Subject: [PATCH] Fix package build (#510) * Fix json save * Fix core deploy * Fix linux deploy --- scripts/package_builder.py | 6 +++++- scripts/package_core.py | 28 ++++++++++++++-------------- scripts/package_desktop.py | 24 +++++++++++++++--------- scripts/package_server.py | 8 ++++++-- scripts/package_utils.py | 3 ++- 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/scripts/package_builder.py b/scripts/package_builder.py index 960088c..fee2b1a 100644 --- a/scripts/package_builder.py +++ b/scripts/package_builder.py @@ -118,6 +118,10 @@ def make_linux(): utils.set_summary("builder build", rc == 0) key_prefix = branding.company_name_l + "/" + common.release_branch + if common.platform == "linux_x86_64": + rpm_arch = "x86_64" + elif common.platform == "linux_aarch64": + rpm_arch = "aarch64" if rc == 0: # utils.log_h2("builder tar deploy") # tar_file = utils.glob_file("tar/*.tar.gz") @@ -132,7 +136,7 @@ def make_linux(): utils.set_summary("builder deb deploy", rc == 0) utils.log_h2("builder rpm deploy") - rpm_file = utils.glob_file("rpm/**/*.rpm") + rpm_file = utils.glob_file("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") rpm_key = key_prefix + "/centos/" + utils.get_basename(rpm_file) rc = aws_s3_upload(rpm_file, rpm_key, "CentOS") utils.set_summary("builder rpm deploy", rc == 0) diff --git a/scripts/package_core.py b/scripts/package_core.py index c02294f..c0cfc14 100644 --- a/scripts/package_core.py +++ b/scripts/package_core.py @@ -38,21 +38,21 @@ def make_core(): return utils.log_h2("core deploy") - rc = utils.cmd( - "aws", "s3", "cp", - "--acl", "public-read", "--no-progress", - core_7z, - "s3://" + common.s3_bucket + "/" + dest_version + "core.7z", - verbose=True - ) + args = ["aws", "s3", "cp", "--acl", "public-read", "--no-progress", + core_7z, "s3://" + common.s3_bucket + "/" + dest_version + "core.7z"] + if common.os_family == "windows": + rc = utils.cmd(*args, verbose=True) + else: + rc = utils.sh(" ".join(args), verbose=True) if rc == 0: utils.add_deploy_data("core", "Archive", core_7z, dest_version + "core.7z") - rc = utils.cmd( - "aws", "s3", "sync", - "--delete", "--acl", "public-read", "--no-progress", - "s3://" + common.s3_bucket + "/" + dest_version, - "s3://" + common.s3_bucket + "/" + dest_latest, - verbose=True - ) + args = ["aws", "s3", "sync", "--delete", + "--acl", "public-read", "--no-progress", + "s3://" + common.s3_bucket + "/" + dest_version, + "s3://" + common.s3_bucket + "/" + dest_latest] + if common.os_family == "windows": + rc = utils.cmd(*args, verbose=True) + else: + rc = utils.sh(" ".join(args), verbose=True) utils.set_summary("core deploy", rc == 0) return diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index c58870d..70a4e77 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -531,9 +531,15 @@ def make_linux(): utils.set_summary("desktop build", rc == 0) key_prefix = branding.company_name_l + "/" + common.release_branch + if common.platform == "linux_x86_64": + tar_arch = "x64" + rpm_arch = "x86_64" + elif common.platform == "linux_aarch64": + tar_arch = "aarch64" + rpm_arch = "aarch64" if rc == 0: utils.log_h2("desktop tar deploy") - tar_file = utils.glob_file("tar/**/*.tar.gz") + tar_file = utils.glob_file("tar/" + tar_arch + "/*.tar.gz") tar_key = key_prefix + "/linux/" + utils.get_basename(tar_file) rc = aws_s3_upload(tar_file, tar_key, "Portable") utils.set_summary("desktop tar deploy", rc == 0) @@ -545,28 +551,28 @@ def make_linux(): utils.set_summary("desktop deb deploy", rc == 0) utils.log_h2("desktop rpm deploy") - rpm_file = utils.glob_file("rpm/**/*.rpm") + rpm_file = utils.glob_file("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") rpm_key = key_prefix + "/centos/" + utils.get_basename(rpm_file) rc = aws_s3_upload(rpm_file, rpm_key, "CentOS") utils.set_summary("desktop rpm deploy", rc == 0) utils.log_h2("desktop apt-rpm deploy") - apt_rpm_file = utils.glob_file("apt-rpm/**/*.rpm") + apt_rpm_file = utils.glob_file("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") apt_rpm_key = key_prefix + "/altlinux/" + utils.get_basename(apt_rpm_file) rc = aws_s3_upload(apt_rpm_file, apt_rpm_key, "AltLinux") utils.set_summary("desktop apt-rpm deploy", rc == 0) utils.log_h2("desktop urpmi deploy") - urpmi_file = utils.glob_file("urpmi/**/*.rpm") + urpmi_file = utils.glob_file("urpmi/builddir/RPMS/" + rpm_arch + "/*.rpm") urpmi_key = key_prefix + "/rosa/" + utils.get_basename(urpmi_file) rc = aws_s3_upload(urpmi_file, urpmi_key, "Rosa") utils.set_summary("desktop urpmi deploy", rc == 0) - utils.log_h2("desktop suse-rpm deploy") - suse_rpm_file = utils.glob_file("suse-rpm/**/*.rpm") - suse_rpm_key = key_prefix + "/suse/" + utils.get_basename(suse_rpm_file) - rc = aws_s3_upload(suse_rpm_file, suse_rpm_key, "SUSE Linux") - utils.set_summary("desktop suse-rpm deploy", rc == 0) + # utils.log_h2("desktop suse-rpm deploy") + # suse_rpm_file = utils.glob_file("suse-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") + # suse_rpm_key = key_prefix + "/suse/" + utils.get_basename(suse_rpm_file) + # rc = aws_s3_upload(suse_rpm_file, suse_rpm_key, "SUSE Linux") + # utils.set_summary("desktop suse-rpm deploy", rc == 0) if not branding.onlyoffice: utils.log_h2("desktop deb-astra deploy") diff --git a/scripts/package_server.py b/scripts/package_server.py index 45b2396..f6a61d0 100644 --- a/scripts/package_server.py +++ b/scripts/package_server.py @@ -83,6 +83,10 @@ def make_linux(edition): utils.set_summary("server " + edition + " build", rc == 0) key_prefix = branding.company_name_l + "/" + common.release_branch + if common.platform == "linux_x86_64": + rpm_arch = "x86_64" + elif common.platform == "linux_aarch64": + rpm_arch = "aarch64" if rc == 0: utils.log_h2("server " + edition + " tar deploy") tar_file = utils.glob_file("*.tar.gz") @@ -97,13 +101,13 @@ def make_linux(edition): utils.set_summary("server " + edition + " deb deploy", rc == 0) utils.log_h2("server " + edition + " rpm deploy") - rpm_file = utils.glob_file("rpm/**/*.rpm") + rpm_file = utils.glob_file("rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") rpm_key = key_prefix + "/centos/" + utils.get_basename(rpm_file) rc = aws_s3_upload(rpm_file, rpm_key, edition, "CentOS") utils.set_summary("server " + edition + " rpm deploy", rc == 0) utils.log_h2("server " + edition + " apt-rpm deploy") - alt_rpm_file = utils.glob_file("apt-rpm/**/*.rpm") + alt_rpm_file = utils.glob_file("apt-rpm/builddir/RPMS/" + rpm_arch + "/*.rpm") alt_rpm_key = key_prefix + "/altlinux/" + utils.get_basename(alt_rpm_file) rc = aws_s3_upload(alt_rpm_file, alt_rpm_key, edition, "AltLinux") utils.set_summary("server " + edition + " apt-rpm deploy", rc == 0) diff --git a/scripts/package_utils.py b/scripts/package_utils.py index ff7789c..b5fb5ef 100644 --- a/scripts/package_utils.py +++ b/scripts/package_utils.py @@ -267,8 +267,9 @@ def add_deploy_data(product, ptype, src, dst): "size": get_file_size(get_path(src)), "remote": dst }) - file = open(get_path(common.workspace_dir + "/deploy.json"), 'w', encoding='utf-8') + file = open(get_path(common.workspace_dir + "/deploy.json"), 'w') file.write(json.dumps(common.deploy_data, sort_keys=True, indent=4)) + file.close() return def cmd(*args, **kwargs):