Skip to content

Commit 8f9eb37

Browse files
committed
DNM Add molecule jobs from edpm-ansible
The edpm-ansible folks would like to run own job also when our changes are related to molecule job. Let's trigger some of they jobs here. Depends-On: openstack-k8s-operators/edpm-ansible#1042 Signed-off-by: Daniel Pawlik <[email protected]>
1 parent 9906dc1 commit 8f9eb37

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

roles/cifmw_cephadm/molecule/default/molecule.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
# Mainly used to override the defaults set in .config/molecule/
33
# By default, it uses the "config_podman.yml" - in CI, it will use
4-
# "config_local.yml".
4+
# "config_local.yml"
5+
#
56
log: true
67

78
provisioner:

scripts/create_role_molecule.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
import logging
2121
from jinja2 import Environment, FileSystemLoader
2222

23+
additional_molecule_jobs = [
24+
"edpm-ansible-molecule-edpm_kernel",
25+
"edpm-ansible-molecule-edpm_podman",
26+
"edpm-ansible-molecule-edpm_ovs",
27+
]
2328

2429
def get_project_paths(project_dir=None):
2530
"""
@@ -90,6 +95,11 @@ def regenerate_projects_zuul_jobs_yaml(generated_paths):
9095
f"cifmw-molecule-{role_directory.name}"
9196
)
9297

98+
if additional_molecule_jobs:
99+
for additional_job in additional_molecule_jobs:
100+
projects_jobs_info[0]["project"]["github-check"]["jobs"].append(
101+
additional_job)
102+
93103
with open(generated_paths["zuul_job_dir"] / "projects.yaml", "w") as projects_file:
94104
yaml.dump(projects_jobs_info, projects_file)
95105

zuul.d/molecule-base.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- ci/playbooks/collect-logs.yml
1616
required-projects:
1717
- github.com/openstack-k8s-operators/install_yamls
18+
- github.com/openstack-k8s-operators/edpm-ansible
1819
vars:
1920
roles_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/roles/{{ TEST_RUN }}"
2021
mol_config_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/.config/molecule/config_local.yml"
@@ -33,6 +34,7 @@
3334
- ci/playbooks/collect-logs.yml
3435
required-projects:
3536
- github.com/openstack-k8s-operators/install_yamls
37+
- github.com/openstack-k8s-operators/edpm-ansible
3638
vars:
3739
roles_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/roles/{{ TEST_RUN }}"
3840
mol_config_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/.config/molecule/config_local.yml"

zuul.d/molecule.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,17 @@
191191
parent: cifmw-molecule-base
192192
vars:
193193
TEST_RUN: cifmw_create_admin
194+
- job:
195+
files:
196+
- ^common-requirements.txt
197+
- ^test-requirements.txt
198+
- ^roles/cifmw_helpers/.*
199+
- ^ci/playbooks/molecule.*
200+
- ^.config/molecule/.*
201+
name: cifmw-molecule-cifmw_helpers
202+
parent: cifmw-molecule-base
203+
vars:
204+
TEST_RUN: cifmw_helpers
194205
- job:
195206
files:
196207
- ^common-requirements.txt
@@ -889,15 +900,6 @@
889900
- ^.config/molecule/.*
890901
name: cifmw-molecule-cifmw_external_dns
891902
parent: cifmw-molecule-noop
892-
- job:
893-
files:
894-
- ^common-requirements.txt
895-
- ^test-requirements.txt
896-
- ^roles/cifmw_helpers/.*
897-
- ^ci/playbooks/molecule.*
898-
- ^.config/molecule/.*
899-
name: cifmw-molecule-cifmw_helpers
900-
parent: cifmw-molecule-noop
901903
- job:
902904
files:
903905
- ^common-requirements.txt

zuul.d/projects.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@
104104
- cifmw-molecule-update_containers
105105
- cifmw-molecule-validations
106106
- cifmw-molecule-virtualbmc
107+
- edpm-ansible-molecule-edpm_kernel
108+
- edpm-ansible-molecule-edpm_podman
109+
- edpm-ansible-molecule-edpm_ovs
107110
github-post:
108111
jobs:
109112
- build-push-container-cifmw-client-post

0 commit comments

Comments
 (0)