Merge pull request #401 from adrianfusco/fix/create-role-molecule

Fix generation of zuul projects.yaml
openstack-k8s-operators · Jul 26, 2023 · f0961ff · f0961ff
2 parents b20bc18 + b2a8f67
commit f0961ff
Show file tree

Hide file tree

Showing 5 changed files with 262 additions and 258 deletions.
diff --git a/ci/config/molecule.yaml b/ci/config/molecule.yaml
@@ -10,3 +10,12 @@
 - job:
     name: cifmw-molecule-rhol_crc
     nodeset: centos-9-crc-xl
+- job:
+    name: cifmw-molecule-operator_deploy
+    nodeset: centos-9-crc-xl
+- job:
+    name: cifmw-molecule-set_openstack_containers
+    parent: cifmw-molecule-base-crc
+- job:
+    name: cifmw-molecule-os_must_gather
+    parent: cifmw-molecule-base-crc
diff --git a/scripts/create_role_molecule.py b/scripts/create_role_molecule.py
@@ -86,7 +86,7 @@ def regenerate_projects_zuul_jobs_yaml(generated_paths):
             logging.warning("Skipping. Not a role directory")
             continue
         projects_jobs_info[0]['project']['github-check']['jobs'].append(
-            role_directory.name
+            f"cifmw-molecule-{role_directory.name}"
         )
 
     with open(generated_paths['zuul_job_dir'] / 'projects.yaml', 'w') as projects_file:

diff --git a/scripts/tests/test_create_role_molecule.py b/scripts/tests/test_create_role_molecule.py
@@ -98,9 +98,9 @@ def test_regenerate_projects_zuul_jobs_yaml(self):
                             'cifmw-kuttl',
                             'cifmw-edpm-build-image',
                             'cifmw-content-provider-build-images',
-                            'role_2',
-                            'role_1',
-                            'role_3'
+                            'cifmw-molecule-role_2',
+                            'cifmw-molecule-role_1',
+                            'cifmw-molecule-role_3'
                         ]
                     }
                 }