Minor fix: run setup only once

ansible-collections · Apr 13, 2022 · ee5869e · ee5869e
1 parent 13efc34
commit ee5869e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/changelogs/fragments/1061-ec2_asg-integration-test-setup-bugfix.yml b/changelogs/fragments/1061-ec2_asg-integration-test-setup-bugfix.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- ec2_asg - fixed bugfix to make test setup run once (https://github.com/ansible-collections/community.aws/pull/1061).
diff --git a/tests/integration/targets/ec2_asg/main.yml b/tests/integration/targets/ec2_asg/main.yml
@@ -14,10 +14,6 @@
         aws_secret_key: "{{ aws_secret_key }}"
         security_token: "{{ security_token | default(omit) }}"
         region: "{{ aws_region }}"
-    vars:
-      # We can't just use "run_once" because the facts don't propagate when
-      # running an 'include' that was run_once
-      setup_run_once: yes
     block:
     - include_role:
         name: 'ec2_asg'

diff --git a/tests/integration/targets/ec2_asg/roles/ec2_asg/defaults/main.yml b/tests/integration/targets/ec2_asg/roles/ec2_asg/defaults/main.yml
@@ -3,3 +3,4 @@
 # Amazon Linux 2 AMI 2019.06.12 (HVM), GP2 Volume Type
 ec2_ami_name: 'amzn2-ami-hvm-2.0.20190612-x86_64-gp2'
 load_balancer_name: "{{ tiny_prefix }}-lb"
+ec2_asg_setup_run_once: true
diff --git a/tests/integration/targets/ec2_asg/roles/ec2_asg/tasks/env_setup.yml b/tests/integration/targets/ec2_asg/roles/ec2_asg/tasks/env_setup.yml
@@ -1,9 +1,8 @@
 - name: Run ec2_asg integration tests.
-
+  run_once: '{{ ec2_asg_setup_run_once }}'
   block:
 
     # ============================================================
-
     - name: Find AMI to use
       ec2_ami_info:
         owners: 'amazon'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- ec2_asg - fixed bugfix to make test setup run once (https://github.com/ansible-collections/community.aws/pull/1061).