Enable cloud tests for use with ansible-test.

2017-05-03 08:24:05 +08:00 · 2017-05-03 08:24:05 +08:00 · 17e07a27b2
commit 17e07a27b2
parent ac72fd9d2c
89 changed files with 66 additions and 3 deletions
--- a/shippable.yml
+++ b/shippable.yml
@ -53,6 +53,9 @@ matrix:
    - env: TEST=linux/ubuntu1404/3
    - env: TEST=linux/ubuntu1604/3
    - env: TEST=linux/ubuntu1604py3/3
+
+    - env: TEST=cloud/ubuntu1604
+    - env: TEST=cloud/ubuntu1604py3
 build:
  pre_ci:
    - docker images drydock/u16pytall
--- a/test/integration/roles/setup_ec2
+++ b/test/integration/roles/setup_ec2
@ -0,0 +1 @@
+../targets/setup_ec2
--- a/test/integration/roles/setup_sshkey
+++ b/test/integration/roles/setup_sshkey
@ -0,0 +1 @@
+../targets/setup_sshkey
--- a/test/integration/targets/cs_account/aliases
+++ b/test/integration/targets/cs_account/aliases
@ -0,0 +1,2 @@
+cloud/cs
+posix/ci/cloud/cs
--- a/test/integration/roles/test_cs_account/meta/main.yml
+++ b/test/integration/roles/test_cs_account/meta/main.yml
--- a/test/integration/roles/test_cs_account/tasks/main.yml
+++ b/test/integration/roles/test_cs_account/tasks/main.yml
--- a/test/integration/targets/cs_affinitygroup/aliases
+++ b/test/integration/targets/cs_affinitygroup/aliases
@ -0,0 +1,2 @@
+cloud/cs
+posix/ci/cloud/cs
--- a/test/integration/roles/test_cs_affinitygroup/meta/main.yml
+++ b/test/integration/roles/test_cs_affinitygroup/meta/main.yml
--- a/test/integration/roles/test_cs_affinitygroup/tasks/main.yml
+++ b/test/integration/roles/test_cs_affinitygroup/tasks/main.yml
--- a/test/integration/targets/cs_cluster/aliases
+++ b/test/integration/targets/cs_cluster/aliases
@ -0,0 +1,3 @@
+cloud/cs
+posix/ci/cloud/cs
+skip/python3
--- a/test/integration/roles/test_cs_cluster/meta/main.yml
+++ b/test/integration/roles/test_cs_cluster/meta/main.yml
--- a/test/integration/roles/test_cs_cluster/tasks/main.yml
+++ b/test/integration/roles/test_cs_cluster/tasks/main.yml
--- a/test/integration/targets/cs_domain/aliases
+++ b/test/integration/targets/cs_domain/aliases
@ -0,0 +1,3 @@
+cloud/cs
+posix/ci/cloud/cs
+skip/python3
--- a/test/integration/roles/test_cs_domain/meta/main.yml
+++ b/test/integration/roles/test_cs_domain/meta/main.yml
--- a/test/integration/roles/test_cs_domain/tasks/main.yml
+++ b/test/integration/roles/test_cs_domain/tasks/main.yml
--- a/test/integration/targets/cs_instancegroup/aliases
+++ b/test/integration/targets/cs_instancegroup/aliases
@ -0,0 +1,2 @@
+cloud/cs
+posix/ci/cloud/cs
--- a/test/integration/roles/test_cs_instancegroup/meta/main.yml
+++ b/test/integration/roles/test_cs_instancegroup/meta/main.yml
--- a/test/integration/roles/test_cs_instancegroup/tasks/main.yml
+++ b/test/integration/roles/test_cs_instancegroup/tasks/main.yml
--- a/test/integration/targets/cs_project/aliases
+++ b/test/integration/targets/cs_project/aliases
@ -0,0 +1,3 @@
+cloud/cs
+posix/ci/cloud/cs
+skip/python3
--- a/test/integration/roles/test_cs_project/meta/main.yml
+++ b/test/integration/roles/test_cs_project/meta/main.yml
--- a/test/integration/roles/test_cs_project/tasks/main.yml
+++ b/test/integration/roles/test_cs_project/tasks/main.yml
--- a/test/integration/targets/cs_resourcelimit/aliases
+++ b/test/integration/targets/cs_resourcelimit/aliases
@ -0,0 +1,3 @@
+cloud/cs
+posix/ci/cloud/cs
+skip/python3
--- a/test/integration/roles/test_cs_resourcelimit/meta/main.yml
+++ b/test/integration/roles/test_cs_resourcelimit/meta/main.yml
--- a/test/integration/roles/test_cs_resourcelimit/tasks/cpu.yml
+++ b/test/integration/roles/test_cs_resourcelimit/tasks/cpu.yml
--- a/test/integration/roles/test_cs_resourcelimit/tasks/instance.yml
+++ b/test/integration/roles/test_cs_resourcelimit/tasks/instance.yml
--- a/test/integration/roles/test_cs_resourcelimit/tasks/main.yml
+++ b/test/integration/roles/test_cs_resourcelimit/tasks/main.yml
--- a/test/integration/targets/cs_securitygroup/aliases
+++ b/test/integration/targets/cs_securitygroup/aliases
@ -0,0 +1,2 @@
+cloud/cs
+posix/ci/cloud/cs
--- a/test/integration/roles/test_cs_securitygroup/meta/main.yml
+++ b/test/integration/roles/test_cs_securitygroup/meta/main.yml
--- a/test/integration/roles/test_cs_securitygroup/tasks/main.yml
+++ b/test/integration/roles/test_cs_securitygroup/tasks/main.yml
--- a/test/integration/targets/cs_securitygroup_rule/aliases
+++ b/test/integration/targets/cs_securitygroup_rule/aliases
@ -0,0 +1,2 @@
+cloud/cs
+posix/ci/cloud/cs
--- a/test/integration/roles/test_cs_securitygroup_rule/meta/main.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/meta/main.yml
--- a/test/integration/roles/test_cs_securitygroup_rule/tasks/absent.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/tasks/absent.yml
--- a/test/integration/roles/test_cs_securitygroup_rule/tasks/cleanup.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/tasks/cleanup.yml
--- a/test/integration/roles/test_cs_securitygroup_rule/tasks/main.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/tasks/main.yml
--- a/test/integration/roles/test_cs_securitygroup_rule/tasks/present.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/tasks/present.yml
--- a/test/integration/roles/test_cs_securitygroup_rule/tasks/setup.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/tasks/setup.yml
--- a/test/integration/targets/cs_user/aliases
+++ b/test/integration/targets/cs_user/aliases
@ -0,0 +1,3 @@
+cloud/cs
+posix/ci/cloud/cs
+skip/python3
--- a/test/integration/roles/test_cs_user/meta/main.yml
+++ b/test/integration/roles/test_cs_user/meta/main.yml
--- a/test/integration/roles/test_cs_user/tasks/main.yml
+++ b/test/integration/roles/test_cs_user/tasks/main.yml
--- a/test/integration/targets/ec2_ami/aliases
+++ b/test/integration/targets/ec2_ami/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_ami/defaults/main.yml
+++ b/test/integration/roles/test_ec2_ami/defaults/main.yml
--- a/test/integration/roles/test_ec2_ami/meta/main.yml
+++ b/test/integration/roles/test_ec2_ami/meta/main.yml
--- a/test/integration/roles/test_ec2_ami/tasks/main.yml
+++ b/test/integration/roles/test_ec2_ami/tasks/main.yml
--- a/test/integration/roles/test_ec2_ami/vars/main.yml
+++ b/test/integration/roles/test_ec2_ami/vars/main.yml
--- a/test/integration/targets/ec2_elb_lb/aliases
+++ b/test/integration/targets/ec2_elb_lb/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_elb_lb/defaults/main.yml
+++ b/test/integration/roles/test_ec2_elb_lb/defaults/main.yml
--- a/test/integration/roles/test_ec2_elb_lb/meta/main.yml
+++ b/test/integration/roles/test_ec2_elb_lb/meta/main.yml
--- a/test/integration/roles/test_ec2_elb_lb/tasks/main.yml
+++ b/test/integration/roles/test_ec2_elb_lb/tasks/main.yml
@ -239,7 +239,7 @@
      assert:
        that:
           - 'result.failed'
-           - 'result.msg == "missing required arguments: name,state"'
+           - 'result.msg.startswith("missing required arguments: ")'



--- a/test/integration/roles/test_ec2_elb_lb/vars/main.yml
+++ b/test/integration/roles/test_ec2_elb_lb/vars/main.yml
--- a/test/integration/targets/ec2_facts/aliases
+++ b/test/integration/targets/ec2_facts/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_facts/defaults/main.yml
+++ b/test/integration/roles/test_ec2_facts/defaults/main.yml
--- a/test/integration/roles/test_ec2_facts/meta/main.yml
+++ b/test/integration/roles/test_ec2_facts/meta/main.yml
--- a/test/integration/roles/test_ec2_facts/tasks/main.yml
+++ b/test/integration/roles/test_ec2_facts/tasks/main.yml
--- a/test/integration/roles/test_ec2_facts/vars/main.yml
+++ b/test/integration/roles/test_ec2_facts/vars/main.yml
--- a/test/integration/targets/ec2_group/aliases
+++ b/test/integration/targets/ec2_group/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_group/defaults/main.yml
+++ b/test/integration/roles/test_ec2_group/defaults/main.yml
--- a/test/integration/roles/test_ec2_group/meta/main.yml
+++ b/test/integration/roles/test_ec2_group/meta/main.yml
--- a/test/integration/roles/test_ec2_group/tasks/main.yml
+++ b/test/integration/roles/test_ec2_group/tasks/main.yml
--- a/test/integration/targets/ec2_key/aliases
+++ b/test/integration/targets/ec2_key/aliases
@ -0,0 +1,3 @@
+cloud/aws
+posix/ci/cloud/aws
+skip/python3
--- a/test/integration/roles/test_ec2_key/defaults/main.yml
+++ b/test/integration/roles/test_ec2_key/defaults/main.yml
--- a/test/integration/roles/test_ec2_key/meta/main.yml
+++ b/test/integration/roles/test_ec2_key/meta/main.yml
--- a/test/integration/roles/test_ec2_key/tasks/main.yml
+++ b/test/integration/roles/test_ec2_key/tasks/main.yml
--- a/test/integration/targets/ec2_tag/aliases
+++ b/test/integration/targets/ec2_tag/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_tag/defaults/main.yml
+++ b/test/integration/roles/test_ec2_tag/defaults/main.yml
--- a/test/integration/roles/test_ec2_tag/meta/main.yml
+++ b/test/integration/roles/test_ec2_tag/meta/main.yml
--- a/test/integration/roles/test_ec2_tag/tasks/main.yml
+++ b/test/integration/roles/test_ec2_tag/tasks/main.yml
--- a/test/integration/roles/test_ec2_tag/vars/main.yml
+++ b/test/integration/roles/test_ec2_tag/vars/main.yml
--- a/test/integration/targets/ec2_vol/aliases
+++ b/test/integration/targets/ec2_vol/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_vol/defaults/main.yml
+++ b/test/integration/roles/test_ec2_vol/defaults/main.yml
--- a/test/integration/roles/test_ec2_vol/meta/main.yml
+++ b/test/integration/roles/test_ec2_vol/meta/main.yml
--- a/test/integration/roles/test_ec2_vol/tasks/main.yml
+++ b/test/integration/roles/test_ec2_vol/tasks/main.yml
--- a/test/integration/roles/test_ec2_vol/vars/main.yml
+++ b/test/integration/roles/test_ec2_vol/vars/main.yml
--- a/test/integration/targets/ec2_vpc/aliases
+++ b/test/integration/targets/ec2_vpc/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ec2_vpc/defaults/main.yml
+++ b/test/integration/roles/test_ec2_vpc/defaults/main.yml
--- a/test/integration/roles/test_ec2_vpc/meta/main.yml
+++ b/test/integration/roles/test_ec2_vpc/meta/main.yml
--- a/test/integration/roles/test_ec2_vpc/tasks/main.yml
+++ b/test/integration/roles/test_ec2_vpc/tasks/main.yml
--- a/test/integration/roles/test_ec2_vpc/vars/main.yml
+++ b/test/integration/roles/test_ec2_vpc/vars/main.yml
--- a/test/integration/targets/ecs_ecr/aliases
+++ b/test/integration/targets/ecs_ecr/aliases
@ -0,0 +1,2 @@
+cloud/aws
+posix/ci/cloud/aws
--- a/test/integration/roles/test_ecs_ecr/defaults/main.yml
+++ b/test/integration/roles/test_ecs_ecr/defaults/main.yml
--- a/test/integration/roles/test_ecs_ecr/meta/main.yml
+++ b/test/integration/roles/test_ecs_ecr/meta/main.yml
--- a/test/integration/roles/test_ecs_ecr/tasks/main.yml
+++ b/test/integration/roles/test_ecs_ecr/tasks/main.yml
--- a/test/integration/targets/setup_ec2/defaults/main.yml
+++ b/test/integration/targets/setup_ec2/defaults/main.yml
--- a/test/integration/targets/setup_ec2/tasks/common.yml
+++ b/test/integration/targets/setup_ec2/tasks/common.yml
--- a/test/integration/targets/setup_sshkey/tasks/main.yml
+++ b/test/integration/targets/setup_sshkey/tasks/main.yml
--- a/test/integration/targets/test_cs_common/aliases
+++ b/test/integration/targets/test_cs_common/aliases
@ -0,0 +1 @@
+hidden
--- a/test/integration/targets/test_cs_common/defaults/main.yml
+++ b/test/integration/targets/test_cs_common/defaults/main.yml
@ -0,0 +1,2 @@
+---
+cs_resource_prefix: cloudstack
--- a/test/utils/shippable/cloud.sh
+++ b/test/utils/shippable/cloud.sh
@ -0,0 +1,11 @@
+#!/bin/bash -eux
+
+set -o pipefail
+
+declare -a args
+IFS='/:' read -ra args <<< "${TEST}"
+
+image="ansible/ansible:${args[1]}"
+target="posix/ci/cloud/"
+
+ansible-test integration --color -v --retry-on-error "${target}" --docker "${image}"
--- a/test/utils/shippable/freebsd.sh
+++ b/test/utils/shippable/freebsd.sh
@ -9,4 +9,4 @@ platform="${args[0]}"
 version="${args[1]}"
 target="posix/ci/"

-ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}"
+ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" --exclude "posix/ci/cloud/"
--- a/test/utils/shippable/osx.sh
+++ b/test/utils/shippable/osx.sh
@ -9,4 +9,4 @@ platform="${args[0]}"
 version="${args[1]}"
 target="posix/ci/"

-ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}"
+ansible-test integration --color -v --retry-on-error "${target}" --remote "${platform}/${version}" --exclude "posix/ci/cloud/"