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

diff --git a/ansible/roles/vncserver/molecule/ubuntu/molecule.yml b/ansible/roles/vncserver/molecule/ubuntu/molecule.yml
new file mode 100644 (file)
index 0000000..d821cd7
--- /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 cb7a5f8..bb5a43e 100644 (file)
--- 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: