Correct global_pins depth

In https://review.openstack.org/350352 the repo_build process
implemented the test vars and changes to the constraints build
which caters properly for global pins, but the data set used
was incorrectly mapped from the py_pkgs lookup output.

This patch fixes the depth, tests and template to use the
correct depth.

Related-Bug: #1605846
Closes-Bug: #1609056
Change-Id: Ic8959fd27b4012d569aef1b9ddd1d7be40ed49e0
This commit is contained in:
Jesse Pretorius 2016-08-03 16:40:51 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 38d7faffa9
commit ca864e298d
3 changed files with 8 additions and 8 deletions

View File

@ -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 #}

View File

@ -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

View File

@ -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"