From 67de62402a9c1fe5fb946dfa89ad11219ddf83f9 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Wed, 8 Oct 2025 12:29:56 +0200 Subject: [PATCH 1/2] 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. Signed-off-by: Daniel Pawlik --- ci/playbooks/molecule-test.yml | 1 + scripts/create_role_molecule.py | 12 ++++++++++++ zuul.d/molecule-base.yaml | 2 ++ zuul.d/projects.yaml | 3 +++ 4 files changed, 18 insertions(+) diff --git a/ci/playbooks/molecule-test.yml b/ci/playbooks/molecule-test.yml index 6d7c6669d6..0cb4410879 100644 --- a/ci/playbooks/molecule-test.yml +++ b/ci/playbooks/molecule-test.yml @@ -49,5 +49,6 @@ chdir: "{{ roles_dir }}" cmd: >- set -o pipefail; + mkdir -p {{ roles_dir }}/../../group_vars ; molecule -c {{ mol_config_dir }} test --all | tee {{ ansible_user_dir }}/ci-framework-data/logs/molecule-execution.log diff --git a/scripts/create_role_molecule.py b/scripts/create_role_molecule.py index c03bf0f072..f20148a728 100755 --- a/scripts/create_role_molecule.py +++ b/scripts/create_role_molecule.py @@ -20,6 +20,12 @@ import logging from jinja2 import Environment, FileSystemLoader +additional_molecule_jobs = [ + "edpm-ansible-molecule-edpm_kernel", + "edpm-ansible-molecule-edpm_podman", + "edpm-ansible-molecule-edpm_ovs", +] + def get_project_paths(project_dir=None): """ @@ -90,6 +96,12 @@ def regenerate_projects_zuul_jobs_yaml(generated_paths): f"cifmw-molecule-{role_directory.name}" ) + if additional_molecule_jobs: + for additional_job in additional_molecule_jobs: + projects_jobs_info[0]["project"]["github-check"]["jobs"].append( + additional_job + ) + with open(generated_paths["zuul_job_dir"] / "projects.yaml", "w") as projects_file: yaml.dump(projects_jobs_info, projects_file) diff --git a/zuul.d/molecule-base.yaml b/zuul.d/molecule-base.yaml index 709544963a..d954065b5b 100644 --- a/zuul.d/molecule-base.yaml +++ b/zuul.d/molecule-base.yaml @@ -15,6 +15,7 @@ - ci/playbooks/collect-logs.yml required-projects: - github.com/openstack-k8s-operators/install_yamls + - github.com/openstack-k8s-operators/edpm-ansible vars: roles_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/roles/{{ TEST_RUN }}" 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 @@ - ci/playbooks/collect-logs.yml required-projects: - github.com/openstack-k8s-operators/install_yamls + - github.com/openstack-k8s-operators/edpm-ansible vars: roles_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/roles/{{ TEST_RUN }}" mol_config_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/.config/molecule/config_local.yml" diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 7e94482b1b..0d89c3eb5f 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -104,6 +104,9 @@ - cifmw-molecule-update_containers - cifmw-molecule-validations - cifmw-molecule-virtualbmc + - edpm-ansible-molecule-edpm_kernel + - edpm-ansible-molecule-edpm_podman + - edpm-ansible-molecule-edpm_ovs github-post: jobs: - build-push-container-cifmw-client-post From c2b06211d634b2d96a02011714110041916012e4 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Fri, 3 Oct 2025 15:23:11 +0200 Subject: [PATCH 2/2] 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: https://github.com/openstack-k8s-operators/ci-framework/pull/3385 Signed-off-by: Daniel Pawlik --- ci/playbooks/molecule-test.yml | 1 - scripts/create_role_molecule.py | 1 - zuul.d/projects.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/ci/playbooks/molecule-test.yml b/ci/playbooks/molecule-test.yml index 0cb4410879..6d7c6669d6 100644 --- a/ci/playbooks/molecule-test.yml +++ b/ci/playbooks/molecule-test.yml @@ -49,6 +49,5 @@ chdir: "{{ roles_dir }}" cmd: >- set -o pipefail; - mkdir -p {{ roles_dir }}/../../group_vars ; molecule -c {{ mol_config_dir }} test --all | tee {{ ansible_user_dir }}/ci-framework-data/logs/molecule-execution.log diff --git a/scripts/create_role_molecule.py b/scripts/create_role_molecule.py index f20148a728..a40078edb2 100755 --- a/scripts/create_role_molecule.py +++ b/scripts/create_role_molecule.py @@ -21,7 +21,6 @@ from jinja2 import Environment, FileSystemLoader additional_molecule_jobs = [ - "edpm-ansible-molecule-edpm_kernel", "edpm-ansible-molecule-edpm_podman", "edpm-ansible-molecule-edpm_ovs", ] diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 0d89c3eb5f..182be6866a 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -104,7 +104,6 @@ - cifmw-molecule-update_containers - cifmw-molecule-validations - cifmw-molecule-virtualbmc - - edpm-ansible-molecule-edpm_kernel - edpm-ansible-molecule-edpm_podman - edpm-ansible-molecule-edpm_ovs github-post: