From a8326ba342fc23bf666b71d202b52c1f4ee9efc9 Mon Sep 17 00:00:00 2001
From: Rafael Castillo <rcastill@redhat.com>
Date: Mon, 31 Jan 2022 11:58:18 -0700
Subject: [PATCH] Move tox-molecule job to centos stream 8

- Switches from openstack-tox-molecule to tripleo-tox-molecule, which is
  set to run on a stream node
- Change the image tag in the molecule config to stream8 and mount the
  necessary vars

Change-Id: Ifdb37e511b516ec6a769cfcf14cfe3ae2668cadc
---
 molecule-requirements.txt          | 4 ++--
 molecule/install-deps/molecule.yml | 5 ++++-
 zuul.d/layout.yaml                 | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index e83fa6bdb..a3e7a666f 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -84,7 +84,7 @@ PyYAML==5.4.1
 requests==2.27.1
 requestsexceptions==1.4.0
 resolvelib==0.5.4
-rfc3986==2.0.0
+rfc3986==1.5.0
 selinux==0.2.1
 sh==1.13.1
 shellingham==1.4.0
@@ -93,7 +93,7 @@ stevedore==3.5.0
 tabulate==0.8.9
 text-unidecode==1.3
 toml==0.10.2
-tomli==2.0.0
+tomli==1.2.3
 tree-format==0.1.2
 urllib3==1.26.8
 warlock==1.3.3
diff --git a/molecule/install-deps/molecule.yml b/molecule/install-deps/molecule.yml
index fead0eaf4..4992f5a74 100644
--- a/molecule/install-deps/molecule.yml
+++ b/molecule/install-deps/molecule.yml
@@ -15,8 +15,11 @@ platforms:
 
   - name: centos8
     hostname: centos8
-    image: centos:8
+    image: quay.io/centos/centos:stream8
     environment: *env
+    volumes:
+      - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
+      - /etc/dnf/vars:/etc/dnf/vars
 
 provisioner:
   name: ansible
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index a29602410..db62bb686 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -7,11 +7,11 @@
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - tripleo-standalone-scenarios-pipeline
-      - openstack-tox-molecule
       - tripleo-upgrades-master-pipeline
     check:
       jobs:
         - openstack-tox-linters
+        - tripleo-tox-molecule
         - tripleo-ci-centos-8-content-provider:
             dependencies:
               - openstack-tox-linters
@@ -28,4 +28,5 @@
     gate:
       queue: tripleo
       jobs:
+        - tripleo-tox-molecule
         - openstack-tox-linters