Merge "Add test_deps_setup_tripleo var"

tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml

@@ -18,13 +18,15 @@
 - name: Prepare
   hosts: all:localhost
   become: true
+  vars:
+    test_deps_setup_tripleo: true
   roles:
     - role: test_deps
   post_tasks:
     - name: Install ovs
       package:
         name:
-          - openvswitch*
+          - openvswitch
           - libibverbs
         state: present
 

tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml

@@ -18,13 +18,15 @@
 - name: Prepare
   hosts: all:localhost
   become: true
+  vars:
+    test_deps_setup_tripleo: true
   roles:
     - role: test_deps
   post_tasks:
     - name: Install ovs
       package:
         name:
-          - openvswitch*
+          - openvswitch
           - libibverbs
         state: present
 

tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

zuul.d/base.yaml

@@ -11,5 +11,5 @@
     - zuul.d/playbooks/pre.yml
     run:
     - zuul.d/playbooks/run.yml
-    timeout: 1800
+    timeout: 3600
     voting: true