Merge "Add test_deps_setup_tripleo var"

2 years ago · d5c0d17a58
14 changed files with 18 additions and 14 deletions
--- a/tripleo_ansible/roles/tripleo_clients_install/molecule/default/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/default/prepare.yml
+++ b/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

--- a/tripleo_ansible/roles/tripleo_ovs_dpdk/molecule/positive/prepare.yml
+++ b/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

--- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_sshd/molecule/banners/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_sshd/molecule/default/molecule.yml
+++ b/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
--- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/molecule.yml
+++ b/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
--- a/zuul.d/base.yaml
+++ b/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