Merge "Add centralized defenition for molecule jobs"

openstack · Jan 7, 2025 · 5a9d238 · 5a9d238
2 parents 3ab787c + 40866d0
commit 5a9d238
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -11,3 +11,9 @@ flake8 # MIT
 ansible-lint==24.12.2 # MIT
 netaddr>=0.7.18 # BSD
 Jinja2>=2.10 # BSD
+
+# Requirements for molecule jobs
+ansible-core==2.17.5 # GPL-3.0
+docker>=7.0.0 # Apache-2.0
+molecule==24.12.0 # MIT
+molecule-plugins[docker]==23.6.0 # MIT
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -647,6 +647,14 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-jammy
 
+- job:
+    name: openstack-ansible-tox-molecule-ubuntu-jammy
+    parent: tox-molecule
+    vars:
+      tox_environment:
+        TEST_BRANCH: "{{ zuul.branch }}"
+        DOCKER_REGISTRY: quay.io/gotmax23
+        DOCKER_IMAGE_TAG: ubuntu-systemd:jammy
 
 # centos 9 stream
 - job:
@@ -744,6 +752,15 @@
     parent: openstack-ansible-deploy-aio
     nodeset: centos-9-stream
 
+- job:
+    name: openstack-ansible-tox-molecule-centos-9-stream
+    parent: tox-molecule
+    vars:
+      tox_environment:
+        TEST_BRANCH: "{{ zuul.branch }}"
+        DOCKER_REGISTRY: quay.io/gotmax23
+        DOCKER_IMAGE_TAG: centos-systemd:stream9
+
 # debian bookworm
 
 - job:
@@ -806,6 +823,15 @@
     parent: openstack-ansible-deploy-aio
     nodeset: debian-bookworm
 
+- job:
+    name: openstack-ansible-tox-molecule-debian-bookworm
+    parent: tox-molecule
+    vars:
+      tox_environment:
+        TEST_BRANCH: "{{ zuul.branch }}"
+        DOCKER_REGISTRY: quay.io/gotmax23
+        DOCKER_IMAGE_TAG: debian-systemd:bookworm
+
 # rocky linux 9
 - job:
     name: openstack-ansible-deploy-aio_lxc-rockylinux-9

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -324,6 +324,19 @@
         - openstack-ansible-deploy-hosts_lxc_overlayfs-debian-bookworm
         - openstack-ansible-deploy-hosts_lxc_overlayfs-rockylinux-9
 
+- project-template:
+    name: openstack-ansible-molecule
+    check:
+      jobs:
+        - openstack-ansible-tox-molecule-centos-9-stream
+        - openstack-ansible-tox-molecule-debian-bookworm
+        - openstack-ansible-tox-molecule-ubuntu-jammy
+    gate:
+      jobs:
+        - openstack-ansible-tox-molecule-centos-9-stream
+        - openstack-ansible-tox-molecule-debian-bookworm
+        - openstack-ansible-tox-molecule-ubuntu-jammy
+
 - project-template:
     name: openstack-ansible-deploy-guide-jobs
     description: |