Skip to content

Commit

Permalink
Adds support for onebranch changes (#233)
Browse files Browse the repository at this point in the history
* Adds procedure to be able to write postgres
versions

* Adds procedure to be able to validate warnings
  • Loading branch information
gurkanindibay authored Jul 28, 2022
1 parent 4a2d487 commit 1bdd130
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 5 deletions.
3 changes: 2 additions & 1 deletion packaging_automation/citus_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,14 @@ def build_package(github_token: non_empty(non_blank(str)),
docker_image_name = "packaging" if not is_test else "packaging-test"
postgres_extension = "all" if postgres_version == "all" else f"pg{postgres_version}"
os.environ["GITHUB_TOKEN"] = github_token
os.environ["CONTAINER_BUILD_RUN_ENABLED"] = "true"
if not os.path.exists(input_output_parameters.output_dir):
os.makedirs(input_output_parameters.output_dir)

output = run_with_output(
f'docker run --rm -v {input_output_parameters.output_dir}:/packages -v '
f'{input_output_parameters.input_files_dir}:/buildfiles:ro -e '
f'GITHUB_TOKEN -e PACKAGE_ENCRYPTION_KEY -e UNENCRYPTED_PACKAGE '
f'GITHUB_TOKEN -e PACKAGE_ENCRYPTION_KEY -e UNENCRYPTED_PACKAGE -e CONTAINER_BUILD_RUN_ENABLED '
f'citus/{docker_image_name}:{docker_platform}-{postgres_extension} {build_type.name}', text=True)

if output.stdout:
Expand Down
3 changes: 2 additions & 1 deletion packaging_automation/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GitPython
Jinja2
parameters_validation
pathlib2
psycopg2
psycopg2-binary
pycurl
PyGithub
pytest
Expand All @@ -16,3 +16,4 @@ urllib3
wheel
python-dotenv
prospector[with_everything]
setuptools==58
4 changes: 2 additions & 2 deletions packaging_automation/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile
Expand Down Expand Up @@ -81,7 +81,7 @@ pluggy==0.13.1
# via pytest
prospector[with_everything]==1.5.0.1
# via -r requirements.in
psycopg2==2.9.1
psycopg2-binary==2.9.3
# via -r requirements.in
py==1.10.0
# via pytest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_filtered_package_count(session) -> int:
# Since package count for our test repo is lower than 100, we get the total package details by getting all the
# packages in one call
result = stat_get_request(
package_list_with_pagination_request_address(PACKAGE_CLOUD_PARAMETERS, 1, 100),
package_list_with_pagination_request_address(PACKAGE_CLOUD_PARAMETERS, 1, 200),
RequestType.package_cloud_list_package, session)
package_info_list = json.loads(result.content)
package_list = list(filter(
Expand Down
15 changes: 15 additions & 0 deletions packaging_automation/validate_build_output.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import argparse

from .packaging_warning_handler import (validate_output)
from .common_tool_methods import (PackageType)
from pathlib import Path

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument('--output_file', required=True)
parser.add_argument('--ignore_file', required=True)
parser.add_argument('--package_type', choices=[p.name for p in PackageType], required=True)

args = parser.parse_args()
build_output = Path(args.output_file).read_text()
validate_output(build_output, args.ignore_file, PackageType[args.package_type])
11 changes: 11 additions & 0 deletions packaging_automation/write_postgres_versions_into_file.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import argparse

from .citus_package import (write_postgres_versions_into_file)

if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument('--project_version', required=True)
parser.add_argument('--input_files_dir', required=True)

args = parser.parse_args()
write_postgres_versions_into_file(args.input_files_dir,args.project_version)

0 comments on commit 1bdd130

Please sign in to comment.