diff options
| author | Sloane Hertel <shertel@redhat.com> | 2019-09-04 15:59:35 +0200 |
|---|---|---|
| committer | Sam Doran <sdoran@redhat.com> | 2019-09-04 15:59:35 +0200 |
| commit | 9ee0deea24e04b5221edec74c74da922a2544a29 (patch) | |
| tree | a19f6429bb70676cb8191f598502b02e94856f61 /test/integration/targets/aws_codebuild | |
| parent | aws_s3 - wait for the bucket before setting ACLs (#61735) (diff) | |
| download | ansible-9ee0deea24e04b5221edec74c74da922a2544a29.tar.xz ansible-9ee0deea24e04b5221edec74c74da922a2544a29.zip | |
aws_codebuild tests - add retries and delay instead of a pause task (#61731)
- Add retries instead of a pause task
- Shorten the IAM role name length
- Put the IAM role name in defaults/main.yml instead
- Fix the aws_codepipeline tests too
Diffstat (limited to 'test/integration/targets/aws_codebuild')
| -rw-r--r-- | test/integration/targets/aws_codebuild/defaults/main.yml | 5 | ||||
| -rw-r--r-- | test/integration/targets/aws_codebuild/tasks/main.yml | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/test/integration/targets/aws_codebuild/defaults/main.yml b/test/integration/targets/aws_codebuild/defaults/main.yml index 36ac6f48a0..9e1009a7fb 100644 --- a/test/integration/targets/aws_codebuild/defaults/main.yml +++ b/test/integration/targets/aws_codebuild/defaults/main.yml @@ -1,2 +1,7 @@ --- # defaults file for aws_codebuild + +# IAM role names have to be less than 64 characters +# The 8 digit identifier at the end of resource_prefix helps determine during +# which test something was created and allows tests to be run in parallel +iam_role_name: "ansible-test-sts-{{ resource_prefix | regex_search('([0-9]+)$') }}-codebuild-service-role" diff --git a/test/integration/targets/aws_codebuild/tasks/main.yml b/test/integration/targets/aws_codebuild/tasks/main.yml index aeef503d89..953aaeaad8 100644 --- a/test/integration/targets/aws_codebuild/tasks/main.yml +++ b/test/integration/targets/aws_codebuild/tasks/main.yml @@ -18,17 +18,13 @@ - name: create IAM role needed for CodeBuild iam_role: - name: "ansible-test-sts-{{ resource_prefix }}-codebuild-service-role" + name: "{{ iam_role_name }}" description: Role with permissions for CodeBuild actions. assume_role_policy_document: "{{ lookup('file', 'codebuild_iam_trust_policy.json') }}" state: present <<: *aws_connection_info register: codebuild_iam_role - - name: Wait until IAM role is available - pause: - seconds: 10 - - name: Set variable with aws account id set_fact: aws_account_id: "{{ codebuild_iam_role.iam_role.arn.split(':')[4] }}" @@ -61,6 +57,9 @@ state: present <<: *aws_connection_info register: output + retries: 10 + delay: 5 + until: output is success - assert: that: @@ -115,6 +114,6 @@ - name: cleanup IAM role created for CodeBuild test iam_role: - name: "{{ resource_prefix }}-codebuild-service-role" + name: "{{ iam_role_name }}" state: absent <<: *aws_connection_info |