From 4889a97a49838e79b271fbee2a58792431d39183 Mon Sep 17 00:00:00 2001
From: Juan Badia Payno <jbadiapa@redhat.com>
Date: Thu, 15 Apr 2021 15:14:13 +0200
Subject: [PATCH] Added back the backup-and-restore molecule to the gate

The purpose here is to decouple the patches [1] which fixes
the ansible role and this one which adds the molecule test to the gate.

[1] - https://review.opendev.org/c/openstack/tripleo-ansible/+/786364

Change-Id: Ia74fef88e1da1b560f2d1377b91c1857ce302143
Depends-On: Ib69f8b5931e846ca012bee8a2bc24dc2a614e274
---
 .../backup-and-restore/molecule/default/molecule.yml     | 2 ++
 .../backup-and-restore/molecule/default/prepare.yml      | 4 ++--
 zuul.d/molecule.yaml                                     | 9 +++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml b/tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml
index 18c391c1d..ed0560eb7 100644
--- a/tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/backup-and-restore/molecule/default/molecule.yml
@@ -43,6 +43,8 @@ provisioner:
 scenario:
   name: default
   test_sequence:
+    - destroy
+    - create
     - prepare
     - converge
 
diff --git a/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml b/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml
index 3abea45f6..378559a1b 100644
--- a/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml
+++ b/tripleo_ansible/roles/backup-and-restore/molecule/default/prepare.yml
@@ -83,13 +83,13 @@
       podman_image:
         name: "{{ item }}"
       with_items:
-        - ubi:8
+        - registry.access.redhat.com/ubi8/ubi-minimal
         - mysql
 
     - name: Create a data container
       podman_container:
         name: "{{ item }}"
-        image: ubi:8
+        image: ubi-minimal
         state: started
         command: sleep 1d
       with_items:
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index 252edd636..ea7d44086 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -3,6 +3,7 @@
     check:
       jobs:
       - tripleo-ansible-centos-8-molecule-aide
+      - tripleo-ansible-centos-8-molecule-backup-and-restore
       - tripleo-ansible-centos-8-molecule-test_deps
       - tripleo-ansible-centos-8-molecule-test_json_error_callback
       - tripleo-ansible-centos-8-molecule-test_package_action
@@ -48,6 +49,7 @@
     gate:
       jobs:
       - tripleo-ansible-centos-8-molecule-aide
+      - tripleo-ansible-centos-8-molecule-backup-and-restore
       - tripleo-ansible-centos-8-molecule-test_deps
       - tripleo-ansible-centos-8-molecule-test_package_action
       - tripleo-ansible-centos-8-molecule-tripleo-bootstrap
@@ -97,6 +99,13 @@
     parent: tripleo-ansible-centos-8-base
     vars:
       tripleo_role_name: aide
+- job:
+    files:
+    - ^tripleo_ansible/roles/backup-and-restore/.*
+    name: tripleo-ansible-centos-8-molecule-backup-and-restore
+    parent: tripleo-ansible-centos-8-base
+    vars:
+      tripleo_role_name: backup-and-restore
 - job:
     files:
     - ^tripleo_ansible/roles/test_deps/.*