diff --git a/ci/playbooks/molecule-test.yml b/ci/playbooks/molecule-test.yml index 871988d9f3..e9b7b196c5 100644 --- a/ci/playbooks/molecule-test.yml +++ b/ci/playbooks/molecule-test.yml @@ -2,6 +2,14 @@ - name: "Run ci/playbooks/molecule-test.yml" hosts: "{{ cifmw_zuul_target_host | default('controller') }}" gather_facts: false + vars: + zuul: + branch: main + items: + - project: + short_name: ci-framework + name: openstack-k8s-operators/ci-framework + src_dir: src/github.com/openstack-k8s-operators/ci-framework tasks: - name: Gather required facts ansible.builtin.setup: diff --git a/roles/cifmw_cephadm/molecule/default/molecule.yml b/roles/cifmw_cephadm/molecule/default/molecule.yml index ed78ad92b2..53a60fa058 100644 --- a/roles/cifmw_cephadm/molecule/default/molecule.yml +++ b/roles/cifmw_cephadm/molecule/default/molecule.yml @@ -1,7 +1,8 @@ --- # Mainly used to override the defaults set in .config/molecule/ # By default, it uses the "config_podman.yml" - in CI, it will use -# "config_local.yml". +# "config_local.yml" +# log: true provisioner: 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