diff options
| author |   Jan Benedikt <j.benedikt@partner.samsung.com> | 2020-02-10 16:36:30 +0100 |
|---|---|---|
| committer | Jan Benedikt <j.benedikt@partner.samsung.com> | 2020-05-18 10:07:19 +0200 |
| commit | 79e68cc5aad7512ea79ae38a6a08a38df8b21498 (patch) | |
| tree | 6cdbd3c7e1e1f3e6eda2a1401b0b66d68081e0ff | |
| parent | e56bd4f45f5d9f68aeb406510cf4aa5741405d80 (diff) | |
Adding Ubuntu support in Ansible - vncserver role
Extending ansible playbooks of ubuntu support.
Creating new test with Ubuntu image for Molecule in vncserver role.
Issue-ID: OOM-1671
Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com>
Change-Id: Ie57885d30166f319629e160c38a9053c18837515
| -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: |