diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-01-30 11:03:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-30 11:03:12 +0000 |
| commit | 711a2cc42376472c6788bf2d18bf31f39792e556 (patch) | |
| tree | 003f06e79fb27691a4ab1e1a92a50d0d1d6ee37e | |
| parent | 75f35a9ee8b6fc8b79ce4db1717f615de9d97b63 (diff) | |
| parent | 47c59054b54331ffa5d6231fd1afcb4c28b4df38 (diff) | |
Merge "Removed version from package name"
| -rwxr-xr-x | build/package.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/build/package.py b/build/package.py index 9e9a6606..c0ca47a5 100755 --- a/build/package.py +++ b/build/package.py @@ -180,9 +180,6 @@ def build_offline_deliverables(build_version, info_file: 'package.info' } - # add separator if build version not empty - build_version = "-" + build_version if build_version != "" else "" - if not skip_sw: log.info('Building offline installer') os.chdir(os.path.join(offline_repository_dir, 'ansible', 'docker')) @@ -190,7 +187,7 @@ def build_offline_deliverables(build_version, os.path.join(offline_repository_dir, 'ansible', 'docker', 'build_ansible_image.sh')) installer_build.check_returncode() os.chdir(script_location) - sw_package_tar_path = os.path.join(output_dir, 'sw_package' + build_version + '.tar') + sw_package_tar_path = os.path.join(output_dir, 'sw_package.tar') create_package(sw_content, sw_package_tar_path) if not skip_resources: @@ -220,11 +217,11 @@ def build_offline_deliverables(build_version, os.chdir(script_location) # End of workaround - resources_package_tar_path = os.path.join(output_dir, 'resources_package' + build_version + '.tar') + resources_package_tar_path = os.path.join(output_dir, 'resources_package.tar') create_package(resources_content, resources_package_tar_path) if not skip_aux: - aux_package_tar_path = os.path.join(output_dir, 'aux_package' + build_version + '.tar') + aux_package_tar_path = os.path.join(output_dir, 'aux_package.tar') create_package(aux_content, aux_package_tar_path) shutil.rmtree(application_dir) |