From becf405fc7d7e2322fcd1f897247505d1515a2f0 Mon Sep 17 00:00:00 2001
From: jlarriba <jlarriba@redhat.com>
Date: Tue, 20 Sep 2022 11:16:46 +0200
Subject: [PATCH] Mark B&R job as voting

backup_and_restore molecule job was marked as non-voting due to
an issue [1] that has been already solved. As it is passing now
we are re-enabling it as a voting job.

[1] https://bugs.launchpad.net/tripleo/+bug/1980198

Change-Id: I1c0b1a7cc869607b3173f98c28af7af91190e927
---
 .../molecule/cli_undercloud_backup_db/prepare.yml         | 6 +++---
 .../roles/backup_and_restore/molecule/default/prepare.yml | 8 ++++----
 zuul.d/molecule.yaml                                      | 1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tripleo_ansible/roles/backup_and_restore/molecule/cli_undercloud_backup_db/prepare.yml b/tripleo_ansible/roles/backup_and_restore/molecule/cli_undercloud_backup_db/prepare.yml
index 67ce17b52..80990ff5c 100644
--- a/tripleo_ansible/roles/backup_and_restore/molecule/cli_undercloud_backup_db/prepare.yml
+++ b/tripleo_ansible/roles/backup_and_restore/molecule/cli_undercloud_backup_db/prepare.yml
@@ -86,7 +86,7 @@
         name: "{{ item }}"
       with_items:
         - registry.access.redhat.com/ubi9/ubi-minimal
-        - docker.io/mysql
+        - quay.io/mariadb-foundation/mariadb-devel:10.11
 
     - name: Create a data container
       containers.podman.podman_container:
@@ -98,10 +98,10 @@
         - test-container1
         - test-container2
 
-    - name: Start myql container
+    - name: Start mysql container
       containers.podman.podman_container:
         name: mysql
-        image: mysql
+        image: quay.io/mariadb-foundation/mariadb-devel:10.11
         state: started
         env:
           MYSQL_ROOT_PASSWORD: password
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 8197294f2..0d6b9783a 100644
--- a/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
+++ b/tripleo_ansible/roles/backup_and_restore/molecule/default/prepare.yml
@@ -85,8 +85,8 @@
       containers.podman.podman_image:
         name: "{{ item }}"
       with_items:
-        - registry.access.redhat.com/ubi8/ubi-minimal
-        - mysql
+        - registry.access.redhat.com/ubi9/ubi-minimal
+        - quay.io/mariadb-foundation/mariadb-devel:10.11
 
     - name: Create a data container
       containers.podman.podman_container:
@@ -98,10 +98,10 @@
         - test-container1
         - test-container2
 
-    - name: Start myql container
+    - name: Start mysql container
       containers.podman.podman_container:
         name: mysql
-        image: mysql
+        image: quay.io/mariadb-foundation/mariadb-devel:10.11
         state: started
         env:
           MYSQL_ROOT_PASSWORD: password
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index 9f2fa1098..cabf1be23 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -234,7 +234,6 @@
     parent: tripleo-ansible-centos-stream-base
     vars:
       tripleo_role_name: backup_and_restore
-    voting: false
 - job:
     files:
     - ^tripleo_ansible/roles/designate_bind_config/(?!meta).*