diff --git a/templates/requirements_constraints.txt.j2 b/templates/requirements_constraints.txt.j2 index 450b1f9..3854785 100644 --- a/templates/requirements_constraints.txt.j2 +++ b/templates/requirements_constraints.txt.j2 @@ -21,7 +21,7 @@ # Global pins set through the file global-requirement-pins.txt # {% set global_pin_packages = [] %} -{% for global_pin in local_packages.results.0.item.role_requirement_files.default.global_pins.pinned_packages %} +{% for global_pin in local_packages.results.0.item.role_requirement_files.global_pins.pinned_packages %} {% set global_pin_package_name = global_pin | regex_replace('(<=|<|==).*$','') %} {% set _ = global_pin_packages.append(global_pin_package_name) %} {# we want to ensure that repo_build_upper_constraints_overrides take the highest precedence #} diff --git a/tests/test-repo-build.yml b/tests/test-repo-build.yml index 1a7793f..73f4d17 100644 --- a/tests/test-repo-build.yml +++ b/tests/test-repo-build.yml @@ -88,7 +88,7 @@ set_fact: global_pins_list: > {%- set global_pins = [] %} - {%- for pin in local_packages.results.0.item.role_requirement_files.default.global_pins.pinned_packages %} + {%- for pin in local_packages.results.0.item.role_requirement_files.global_pins.pinned_packages %} {%- set name = pin | regex_replace('(>=|<=|>|<|==|~=|!=).*$','') %} {%- set name_normalized = name | replace('-', '_') | lower %} {%- set _ = global_pins.append(name_normalized) %} @@ -105,7 +105,7 @@ - name: Ensure that global pins have been applied assert: that: item in requirements_constraints_content - with_items: "{{ local_packages.results.0.item.role_requirement_files.default.global_pins.pinned_packages }}" + with_items: "{{ local_packages.results.0.item.role_requirement_files.global_pins.pinned_packages }}" when: - item | regex_replace('(>=|<=|>|<|==|~=|!=).*$','') not in upper_constraints_override_list - name: Ensure that upper constraints overrides are applied diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 09d0502..1819c10 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -458,8 +458,8 @@ local_packages: - "pip==8.1.2" - "setuptools==25.1.0" - "wheel==0.29.0" - global_pins: - pinned_packages: - - "pip==8.1.2" - - "setuptools==25.1.0" - - "wheel==0.29.0" + global_pins: + pinned_packages: + - "pip==8.1.2" + - "setuptools==25.1.0" + - "wheel==0.29.0"