[inventory_aws_conformance] fix the order of list variables created i…

…n config since it otherwise varies (ansible#54365) modify mock for boto to reflect the new fixed order for the config
garnaud · Mar 26, 2019 · a47edc9 · a47edc9
1 parent 6996926
commit a47edc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py b/test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py
@@ -179,7 +179,7 @@ class InstanceBase(object):
     def __init__(self, stopped=False):
         # set common ignored attribute to make sure instances have identical tags and security groups
         self._ignore_security_groups = {
-            'sg-0e1d2bd02b45b712e': 'sgname-with-hyphens',
+            'sg-0e1d2bd02b45b712e': 'a-sgname-with-hyphens',
             'sg-ae5c262eb5c4d712e': 'name@with?invalid!chars'
         }
         self._ignore_tags = {

diff --git a/test/integration/targets/inventory_aws_conformance/runme.sh b/test/integration/targets/inventory_aws_conformance/runme.sh
@@ -87,8 +87,8 @@ compose:
   ec2_placement: placement['availability_zone']
   ec2_ramdisk: ramdisk_id | default("")
   ec2_reason: state_transition_reason
-  ec2_security_group_ids: security_groups | map(attribute='group_id') | list |  join(',')
-  ec2_security_group_names: security_groups | map(attribute='group_name') | list |  join(',')
+  ec2_security_group_ids: security_groups | map(attribute='group_id') | list | sort | join(',')
+  ec2_security_group_names: security_groups | map(attribute='group_name') | list | sort | join(',')
   ec2_state: state['name']
   ec2_state_code: state['code']
   ec2_state_reason: state_reason['message'] if state_reason is defined else ""