diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-05-18 09:50:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-18 09:50:24 +0000 |
| commit | 3e8a8868d7ef936ad85a360845d2c071d585c57b (patch) | |
| tree | 91c93b0e28e69bf5319c8040b70d0dd17685092b | |
| parent | 2c34d1d7a33e34c9984ac78460fd8e7c815024c5 (diff) | |
| parent | 79e68cc5aad7512ea79ae38a6a08a38df8b21498 (diff) | |
Merge "Adding Ubuntu support in Ansible - vncserver role"
| -rw-r--r-- | ansible/roles/vncserver/molecule/ubuntu/molecule.yml | 39 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-vncserver/tasks/main.yml | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml new file mode 100644 index 00000000..d821cd73 --- /dev/null +++ b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml @@ -0,0 +1,39 @@ +--- +dependency: + name: galaxy +driver: + name: docker +lint: + name: yamllint +platforms: + - name: infrastructure-server + image: molecule-${PREBUILD_PLATFORM_DISTRO:-ubuntu}:${PREBUILD_DISTRO_VERSION:-18.04} + pre_build_image: True + privileged: true + volumes: + - /var/lib/docker + override_command: False + groups: + - infrastructure +provisioner: + name: ansible + lint: + name: ansible-lint + playbooks: + prepare: ../default/prepare.yml + converge: ../default/playbook.yml + cleanup: ../default/cleanup.yml + env: + ANSIBLE_ROLES_PATH: ../../../../test/roles + inventory: + links: + group_vars: ../../../../group_vars +scenario: + name: ubuntu +verifier: + name: testinfra + lint: + name: flake8 + options: + v: 1 + directory: ../default/tests/ diff --git a/ansible/test/roles/prepare-vncserver/tasks/main.yml b/ansible/test/roles/prepare-vncserver/tasks/main.yml index cb7a5f8a..bb5a43ef 100644 --- a/ansible/test/roles/prepare-vncserver/tasks/main.yml +++ b/ansible/test/roles/prepare-vncserver/tasks/main.yml @@ -14,6 +14,7 @@ name: "{{ vnc_server_image }}" state: present archive_path: /tmp/vncserver.tar + timeout: 240 - name: Copy vnc server image to node copy: |