From 0c2590d3df2cf91fa923697a09fad256c57e18a0 Mon Sep 17 00:00:00 2001
From: Sloane Hertel <shertel@redhat.com>
Date: Fri, 30 Aug 2019 11:47:32 -0400
Subject: [PATCH] Run ec2_vol_facts integration tests in CI (#48755)

Filter owner aliases by 'amazon' since amazon marketplace may not be activated
---
 test/integration/targets/aws_codecommit/aliases        | 2 +-
 test/integration/targets/aws_codecommit/tasks/main.yml | 6 ++----
 test/integration/targets/ec2_vol_info/tasks/main.yml   | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/integration/targets/aws_codecommit/aliases b/test/integration/targets/aws_codecommit/aliases
index 56927195182..6e3860bee23 100644
--- a/test/integration/targets/aws_codecommit/aliases
+++ b/test/integration/targets/aws_codecommit/aliases
@@ -1,2 +1,2 @@
 cloud/aws
-unsupported
+shippable/aws/group2
diff --git a/test/integration/targets/aws_codecommit/tasks/main.yml b/test/integration/targets/aws_codecommit/tasks/main.yml
index 834ddc1e08b..70a9cd146f4 100644
--- a/test/integration/targets/aws_codecommit/tasks/main.yml
+++ b/test/integration/targets/aws_codecommit/tasks/main.yml
@@ -20,8 +20,8 @@
   - assert:
       that:
         - output is changed
-        - output.repositoryName == '{{ resource_prefix }}_repo'
-        - output.repositoryDescription == 'original comment'
+        - output['repository_metadata'].repository_name == '{{ resource_prefix }}_repo'
+        - output['repository_metadata'].repository_description == 'original comment'
   # ============================================================
   - name: Create a repository (CHECK MODE)
     aws_codecommit:
@@ -34,8 +34,6 @@
   - assert:
       that:
         - output is changed
-        - output.repositoryName == '{{ resource_prefix }}_check_repo'
-        - output.repositoryDescription == 'original comment'
   # ============================================================
   - name: Delete  a repository (CHECK MODE)
     aws_codecommit:
diff --git a/test/integration/targets/ec2_vol_info/tasks/main.yml b/test/integration/targets/ec2_vol_info/tasks/main.yml
index 2d9e6b9ef99..9bde0307613 100644
--- a/test/integration/targets/ec2_vol_info/tasks/main.yml
+++ b/test/integration/targets/ec2_vol_info/tasks/main.yml
@@ -11,6 +11,7 @@
 
 - block:
     - ec2_ami_info:
+        owners: amazon
         <<: *aws_connection_info
         filters:
           architecture: x86_64