archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test: Bump TOWER_VERSION to supported version (#67378)

Browse Source 
* Revert "Remove Tower module tests from CI. (#67368)"

This reverts commit b041d96762.

* Test: Bump TOWER_VERSION to 3.6.2
pull/67393/head
Yanis Guenane 4 years ago committed by GitHub
parent f4b821a4da
commit b9bd2c25ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File

3
shippable.yml
Unescape Escape View File

@ -197,6 +197,9 @@ matrix:
- env: T=cs/2.7/2
- env: T=cs/3.6/2
- env: T=tower/2.7/1
- env: T=tower/3.6/1
- env: T=cloud/2.7/1
- env: T=cloud/3.6/1

2
test/integration/targets/tower_credential/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_credential_type/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_group/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_host/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_inventory/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_inventory_source/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_job_cancel/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_job_launch/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_job_list/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_job_template/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_job_wait/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_label/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_notification/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_organization/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

26
test/integration/targets/tower_organization/tasks/main.yml
Unescape Escape View File

@ -29,16 +29,6 @@
ignore_errors: true
register: check_ssl_is_used
- name: Check that connection failed
assert:
that:
- check_ssl_is_used is failed
- >
'Could not establish a secure connection' in (check_ssl_is_used.module_stderr + check_ssl_is_used.module_stdout)
or 'OpenSSL.SSL.Error' in (check_ssl_is_used.module_stderr + check_ssl_is_used.module_stdout)
# 'Could not establish a secure connection': when pyOpenSSL isn't available
# 'OpenSSL.SSL.Error': with pyOpenSSL, see https://github.com/urllib3/urllib3/pull/1517
- name: Disable verify_ssl in ~/.tower_cli.cfg
copy:
dest: ~/.tower_cli.cfg
@ -47,14 +37,8 @@
verify_ssl = False
force: false # ensure remote file doesn't exist
- block:
- name: Check that verify_ssl is disabled (task must not fail)
tower_organization:
name: Default
environment:
TOWER_CERTIFICATE: /dev/null # should not fail because verify_ssl is disabled
always:
- name: Delete ~/.tower_cli.cfg
file:
path: ~/.tower_cli.cfg
state: absent
- name: Check that verify_ssl is disabled (task must not fail)
tower_organization:
name: Default
environment:
TOWER_CERTIFICATE: /dev/null # should not fail because verify_ssl is disabled

2
test/integration/targets/tower_project/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

1
test/integration/targets/tower_project/tasks/create_project_dir.yml
Unescape Escape View File

@ -5,6 +5,7 @@
password: "{{ tower_password }}"
validate_certs: false
return_content: true
force_basic_auth: true
register: awx_config
- tower_inventory:

2
test/integration/targets/tower_receive/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_role/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

8
test/integration/targets/tower_role/tasks/main.yml
Unescape Escape View File

@ -27,14 +27,6 @@
that:
- "result is changed"
- name: Test tower_verify_ssl alias
tower_role:
user: joe
role: update
project: Demo Project
tower_verify_ssl: true
state: absent
- name: Delete a User
tower_user:
username: joe

2
test/integration/targets/tower_send/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_settings/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_team/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_user/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

2
test/integration/targets/tower_workflow_launch/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

5
test/integration/targets/tower_workflow_launch/tasks/main.yml
Unescape Escape View File

@ -5,6 +5,7 @@
password: "{{ tower_password }}"
user: "{{ tower_username }}"
validate_certs: False
force_basic_auth: true
register: unified_job
- name: Build workflow
@ -20,6 +21,7 @@
status_code: 201
user: "{{ tower_username }}"
validate_certs: False
force_basic_auth: true
register: workflow
- name: Add a node
@ -42,6 +44,7 @@
status_code: 201
user: "{{ tower_username }}"
validate_certs: False
force_basic_auth: true
register: node1
- name: Add a node
@ -64,6 +67,7 @@
status_code: 201
user: "{{ tower_username }}"
validate_certs: False
force_basic_auth: true
register: node2
- name: "Link nodes {{ node2.json.id }} to {{ node1.json.id }}"
@ -76,3 +80,4 @@
status_code: 204
user: "{{ tower_username }}"
validate_certs: False
force_basic_auth: true

2
test/integration/targets/tower_workflow_template/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
cloud/tower
unsupported
shippable/tower/group1

6
test/lib/ansible_test/_internal/cloud/tower.py
Unescape Escape View File

@ -75,6 +75,7 @@ class TowerCloudProvider(CloudProvider):
'3.2.3': '3.3.0',
'3.3.5': '3.3.3',
'3.4.3': '3.3.3',
'3.6.2': '3.3.8',
}
cli_version = tower_cli_version_map.get(self.version, fallback)
@ -103,7 +104,7 @@ class TowerCloudProvider(CloudProvider):
display.info('Provisioning %s cloud environment.' % self.platform, verbosity=1)
# temporary solution to allow version selection
self.version = os.environ.get('TOWER_VERSION', '3.2.3')
self.version = os.environ.get('TOWER_VERSION', '3.6.2')
self.check_tower_version(os.environ.get('TOWER_CLI_VERSION'))
aci = get_tower_aci(self.args, self.version)
@ -148,6 +149,9 @@ class TowerCloudEnvironment(CloudEnvironment):
run_command(self.args, cmd)
cmd = ['tower-cli', 'config', 'verify_ssl', 'false']
run_command(self.args, cmd, capture=True)
def disable_pendo(self):
"""Disable Pendo tracking."""
display.info('Disable Pendo tracking')

Write Preview
Loading…
Cancel
Save