From 5ddee05d7670ef27322352c3bf726cd5116208d9 Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Tue, 10 Nov 2020 11:45:07 -0800 Subject: [PATCH] Remove the need for docker This change moves our one tox-molecule job to simply depending on the zuul tox job. To ensure we're not depending on the docker driver at all, docker has been replaced with podman in the tripleo_redhat_enforce test job. Change-Id: I590a500b397d22d2e6fd4336f306caadcb690f45 Signed-off-by: Kevin Carter (cherry picked from commit 03cae88d6373a38e55f717eecfbb69fe82110070) --- .../roles/tripleo_redhat_enforce/molecule/default/molecule.yml | 2 +- zuul.d/molecule.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml index c78d715b3..fb311b7d7 100644 --- a/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/tripleo_redhat_enforce/molecule/default/molecule.yml @@ -1,6 +1,6 @@ --- driver: - name: docker + name: podman log: true diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index 41adb061c..2c29d65d4 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -538,7 +538,7 @@ - ^zuul.d/molecule.yaml name: tripleo-ansible-centos-8-role-addition nodeset: centos-8 - parent: tox-molecule + parent: tox timeout: 1800 vars: tox_envlist: role-addition