From 7bb35e8781b46cb6024a6e45e76cb663185fe10d Mon Sep 17 00:00:00 2001 From: Sloane Hertel Date: Fri, 8 Dec 2017 10:13:22 -0500 Subject: [PATCH] Fix using loops with environment and add tests (#32796) --- lib/ansible/plugins/action/__init__.py | 7 +- .../targets/environment/test_environment.yml | 90 +++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 5a1d3c5ffd..918ae167a6 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -180,10 +180,9 @@ class ActionBase(with_metaclass(ABCMeta, object)): if not isinstance(environments, list): environments = [environments] - # the environments as inherited need to be reversed, to make - # sure we merge in the parent's values first so those in the - # block then task 'win' in precedence - environments.reverse() + # The order of environments matters to make sure we merge + # in the parent's values first so those in the block then + # task 'win' in precedence for environment in environments: if environment is None or len(environment) == 0: continue diff --git a/test/integration/targets/environment/test_environment.yml b/test/integration/targets/environment/test_environment.yml index e35a438582..f8e49ac8d0 100644 --- a/test/integration/targets/environment/test_environment.yml +++ b/test/integration/targets/environment/test_environment.yml @@ -74,3 +74,93 @@ - '"not1" in test_env5.stdout_lines' - '"val2" in test_env5.stdout_lines' environment: "{{test2}}" + +- name: test setting environment while using loops + hosts: testhost + environment: + foo: outer + tasks: + - name: verify foo==outer + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==outer + assert: + that: + - "{{ test_foo.results[0].stdout == 'outer' }}" + + - name: set environment on a task + environment: + foo: in_task + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==in_task + assert: + that: + - "test_foo.results[0].stdout == 'in_task'" + + - name: test that the outer env var is set appropriately still + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==outer + assert: + that: + - "{{ test_foo.results[0].stdout == 'outer' }}" + + - name: set environment on a block + environment: + foo: in_block + block: + - name: test the environment is set in the block + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==in_block + assert: + that: + - "test_foo.results[0].stdout == 'in_block'" + + - name: test setting environment in a task inside a block + environment: + foo: in_block_in_task + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==in_block_in_task + assert: + that: + - "test_foo.results[0].stdout == 'in_block_in_task'" + + - name: test the environment var is set to the parent value + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==in_block + assert: + that: + - "test_foo.results[0].stdout == 'in_block'" + + - name: test the env var foo has the initial value + command: /bin/echo $foo + loop: + - 1 + register: test_foo + + - name: assert foo==outer + assert: + that: + - "{{ test_foo.results[0].stdout == 'outer' }}"