From b2a8f67a910e94c6b3074df859dad3fcd45d3fec Mon Sep 17 00:00:00 2001 From: Adrian Fusco Arnejo Date: Mon, 24 Jul 2023 17:34:46 +0200 Subject: [PATCH] Fix generation of zuul projects.yaml Update molecule.yaml jobs nodeset Regenerate zuul jobs --- ci/config/molecule.yaml | 9 + scripts/create_role_molecule.py | 2 +- scripts/tests/test_create_role_molecule.py | 6 +- zuul.d/molecule.yaml | 414 ++++++++++----------- zuul.d/projects.yaml | 89 +++-- 5 files changed, 262 insertions(+), 258 deletions(-) diff --git a/ci/config/molecule.yaml b/ci/config/molecule.yaml index de27292f11..bad91b3f07 100644 --- 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 index 05cd287c8b..0e52a16f21 100755 --- 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 index 72d4a1b8c4..a28d89486a 100644 --- 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' ] } } diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml index ef37c6d563..d510dfe871 100644 --- a/zuul.d/molecule.yaml +++ b/zuul.d/molecule.yaml @@ -1,305 +1,305 @@ -# DO NOT EDIT - generaged using make role_molecule - job: - name: cifmw-molecule-artifacts + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/polarion/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-polarion parent: cifmw-molecule-base vars: - TEST_RUN: artifacts + TEST_RUN: polarion +- job: files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/artifacts/(?!meta|README).* - - ^ci/playbooks/molecule.* + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/os_must_gather/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-os_must_gather + parent: cifmw-molecule-base-crc + vars: + TEST_RUN: os_must_gather - job: - name: cifmw-molecule-build_openstack_packages + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/copy_container/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-copy_container parent: cifmw-molecule-base vars: - TEST_RUN: build_openstack_packages + TEST_RUN: copy_container +- job: files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/build_openstack_packages/(?!meta|README).* - - ^ci/playbooks/molecule.* + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/set_openstack_containers/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-set_openstack_containers + parent: cifmw-molecule-base-crc + vars: + TEST_RUN: set_openstack_containers - job: - name: cifmw-molecule-ci_setup + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/os_net_setup/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-os_net_setup parent: cifmw-molecule-base vars: - TEST_RUN: ci_setup - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/ci_setup/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: os_net_setup - job: - name: cifmw-molecule-copy_container + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/registry_deploy/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-registry_deploy parent: cifmw-molecule-base vars: - TEST_RUN: copy_container - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/copy_container/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: registry_deploy - job: - name: cifmw-molecule-discover_latest_image + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/openshift_provisioner_node/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-openshift_provisioner_node + nodeset: centos-9-crc-xl parent: cifmw-molecule-base vars: - TEST_RUN: discover_latest_image - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/discover_latest_image/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: openshift_provisioner_node - job: + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/edpm_build_images/(?!meta|README).* + - ^ci/playbooks/molecule.* name: cifmw-molecule-edpm_build_images parent: cifmw-molecule-base vars: TEST_RUN: edpm_build_images - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/edpm_build_images/(?!meta|README).* - - ^ci/playbooks/molecule.* - job: - name: cifmw-molecule-edpm_deploy - parent: cifmw-molecule-base - vars: - TEST_RUN: edpm_deploy files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/edpm_deploy/(?!meta|README).* - - ^ci/playbooks/molecule.* -- job: - name: cifmw-molecule-edpm_deploy_baremetal + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/pkg_build/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-pkg_build parent: cifmw-molecule-base vars: - TEST_RUN: edpm_deploy_baremetal - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/edpm_deploy_baremetal/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: pkg_build - job: + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/edpm_prepare/(?!meta|README).* + - ^ci/playbooks/molecule.* name: cifmw-molecule-edpm_prepare parent: cifmw-molecule-base vars: TEST_RUN: edpm_prepare - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/edpm_prepare/(?!meta|README).* - - ^ci/playbooks/molecule.* - job: - name: cifmw-molecule-hive - parent: cifmw-molecule-base - vars: - TEST_RUN: hive files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/hive/(?!meta|README).* - - ^ci/playbooks/molecule.* -- job: - name: cifmw-molecule-install_ca + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/repo_setup/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-repo_setup parent: cifmw-molecule-base vars: - TEST_RUN: install_ca - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/install_ca/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: repo_setup - job: - name: cifmw-molecule-install_yamls - parent: cifmw-molecule-base - vars: - TEST_RUN: install_yamls files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/install_yamls/(?!meta|README).* - - ^ci/playbooks/molecule.* -- job: - name: cifmw-molecule-libvirt_manager + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/tempest/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-tempest parent: cifmw-molecule-base vars: - TEST_RUN: libvirt_manager - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/libvirt_manager/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: tempest - job: + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/local_env_vm/(?!meta|README).* + - ^ci/playbooks/molecule.* name: cifmw-molecule-local_env_vm parent: cifmw-molecule-base vars: TEST_RUN: local_env_vm - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/local_env_vm/(?!meta|README).* - - ^ci/playbooks/molecule.* - job: + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/openshift_login/(?!meta|README).* + - ^ci/playbooks/molecule.* name: cifmw-molecule-openshift_login nodeset: centos-9-crc-xl parent: cifmw-molecule-base vars: TEST_RUN: openshift_login - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/openshift_login/(?!meta|README).* - - ^ci/playbooks/molecule.* - job: - name: cifmw-molecule-openshift_provisioner_node + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/libvirt_manager/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-libvirt_manager parent: cifmw-molecule-base vars: - TEST_RUN: openshift_provisioner_node - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/openshift_provisioner_node/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: libvirt_manager - job: + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/openshift_setup/(?!meta|README).* + - ^ci/playbooks/molecule.* name: cifmw-molecule-openshift_setup nodeset: centos-9-crc-xl parent: cifmw-molecule-base vars: TEST_RUN: openshift_setup - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/openshift_setup/(?!meta|README).* - - ^ci/playbooks/molecule.* - job: - name: cifmw-molecule-operator_build + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/artifacts/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-artifacts parent: cifmw-molecule-base vars: - TEST_RUN: operator_build + TEST_RUN: artifacts +- job: files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/operator_build/(?!meta|README).* - - ^ci/playbooks/molecule.* + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/run_hook/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-run_hook + parent: cifmw-molecule-base + vars: + TEST_RUN: run_hook - job: - name: cifmw-molecule-operator_deploy + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/rhol_crc/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-rhol_crc nodeset: centos-9-crc-xl parent: cifmw-molecule-base vars: - TEST_RUN: operator_deploy - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/operator_deploy/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: rhol_crc - job: - name: cifmw-molecule-os_must_gather - parent: cifmw-molecule-base-crc - vars: - TEST_RUN: os_must_gather files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/os_must_gather/(?!meta|README).* - - ^ci/playbooks/molecule.* -- job: - name: cifmw-molecule-os_net_setup + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/install_ca/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-install_ca parent: cifmw-molecule-base vars: - TEST_RUN: os_net_setup - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/os_net_setup/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: install_ca - job: - name: cifmw-molecule-pkg_build + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/install_yamls/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-install_yamls parent: cifmw-molecule-base vars: - TEST_RUN: pkg_build - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/pkg_build/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: install_yamls - job: - name: cifmw-molecule-polarion + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/operator_build/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-operator_build parent: cifmw-molecule-base vars: - TEST_RUN: polarion - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/polarion/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: operator_build - job: - name: cifmw-molecule-registry_deploy + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/discover_latest_image/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-discover_latest_image parent: cifmw-molecule-base vars: - TEST_RUN: registry_deploy - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/registry_deploy/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: discover_latest_image - job: - name: cifmw-molecule-repo_setup + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/test_deps/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-test_deps parent: cifmw-molecule-base vars: - TEST_RUN: repo_setup - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/repo_setup/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: test_deps - job: - name: cifmw-molecule-rhol_crc - nodeset: centos-9-crc-xl + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/ci_setup/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-ci_setup parent: cifmw-molecule-base vars: - TEST_RUN: rhol_crc - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/rhol_crc/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: ci_setup - job: - name: cifmw-molecule-run_hook + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/edpm_deploy/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-edpm_deploy parent: cifmw-molecule-base vars: - TEST_RUN: run_hook - files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/run_hook/(?!meta|README).* - - ^ci/playbooks/molecule.* + TEST_RUN: edpm_deploy - job: - name: cifmw-molecule-set_openstack_containers - parent: cifmw-molecule-base-crc - vars: - TEST_RUN: set_openstack_containers files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/set_openstack_containers/(?!meta|README).* - - ^ci/playbooks/molecule.* -- job: - name: cifmw-molecule-tempest + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/hive/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-hive parent: cifmw-molecule-base vars: - TEST_RUN: tempest + TEST_RUN: hive +- job: files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/tempest/(?!meta|README).* - - ^ci/playbooks/molecule.* + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/build_openstack_packages/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-build_openstack_packages + parent: cifmw-molecule-base + vars: + TEST_RUN: build_openstack_packages - job: - name: cifmw-molecule-test_deps + files: + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/operator_deploy/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-operator_deploy + nodeset: centos-9-crc-xl parent: cifmw-molecule-base vars: - TEST_RUN: test_deps + TEST_RUN: operator_deploy +- job: files: - - ^ansible-requirements.txt - - ^molecule-requirements.txt - - ^ci_framework/roles/test_deps/(?!meta|README).* - - ^ci/playbooks/molecule.* + - ^ansible-requirements.txt + - ^molecule-requirements.txt + - ^ci_framework/roles/edpm_deploy_baremetal/(?!meta|README).* + - ^ci/playbooks/molecule.* + name: cifmw-molecule-edpm_deploy_baremetal + parent: cifmw-molecule-base + vars: + TEST_RUN: edpm_deploy_baremetal diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 12480f3327..e4e8b640de 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -1,50 +1,45 @@ -# DO NOT EDIT /zuul.d/project.yaml. This file is generated using the following -# command: ** make role_molecule ** -# If you need to add new jobs in the project, please edit -# ** /ci/templates/project.yaml ** - project: - name: openstack-k8s-operators/ci-framework github-check: jobs: - - noop - - ci-framework-crc-podified-galera-deployment - - ci-framework-crc-podified-edpm-baremetal - - ci-framework-crc-podified-edpm-deployment - - cifmw-dev-prepare - - cifmw-doc - - cifmw-end-to-end - - cifmw-end-to-end-nobuild-tagged - - cifmw-kuttl - - cifmw-edpm-build-images - - cifmw-content-provider-build-images -# Start generated content - - cifmw-molecule-artifacts - - cifmw-molecule-build_openstack_packages - - cifmw-molecule-ci_setup - - cifmw-molecule-copy_container - - cifmw-molecule-discover_latest_image - - cifmw-molecule-edpm_build_images - - cifmw-molecule-edpm_deploy - - cifmw-molecule-edpm_deploy_baremetal - - cifmw-molecule-edpm_prepare - - cifmw-molecule-hive - - cifmw-molecule-install_ca - - cifmw-molecule-install_yamls - - cifmw-molecule-libvirt_manager - - cifmw-molecule-local_env_vm - - cifmw-molecule-openshift_login - - cifmw-molecule-openshift_provisioner_node - - cifmw-molecule-openshift_setup - - cifmw-molecule-operator_build - - cifmw-molecule-operator_deploy - - cifmw-molecule-os_must_gather - - cifmw-molecule-os_net_setup - - cifmw-molecule-pkg_build - - cifmw-molecule-polarion - - cifmw-molecule-registry_deploy - - cifmw-molecule-repo_setup - - cifmw-molecule-rhol_crc - - cifmw-molecule-run_hook - - cifmw-molecule-set_openstack_containers - - cifmw-molecule-tempest - - cifmw-molecule-test_deps + - noop + - ci-framework-crc-podified-galera-deployment + - ci-framework-crc-podified-edpm-baremetal + - ci-framework-crc-podified-edpm-deployment + - cifmw-dev-prepare + - cifmw-doc + - cifmw-end-to-end + - cifmw-end-to-end-nobuild-tagged + - cifmw-kuttl + - cifmw-edpm-build-images + - cifmw-content-provider-build-images + - cifmw-molecule-polarion + - cifmw-molecule-os_must_gather + - cifmw-molecule-copy_container + - cifmw-molecule-set_openstack_containers + - cifmw-molecule-os_net_setup + - cifmw-molecule-registry_deploy + - cifmw-molecule-openshift_provisioner_node + - cifmw-molecule-edpm_build_images + - cifmw-molecule-pkg_build + - cifmw-molecule-edpm_prepare + - cifmw-molecule-repo_setup + - cifmw-molecule-tempest + - cifmw-molecule-local_env_vm + - cifmw-molecule-openshift_login + - cifmw-molecule-libvirt_manager + - cifmw-molecule-openshift_setup + - cifmw-molecule-artifacts + - cifmw-molecule-run_hook + - cifmw-molecule-rhol_crc + - cifmw-molecule-install_ca + - cifmw-molecule-install_yamls + - cifmw-molecule-operator_build + - cifmw-molecule-discover_latest_image + - cifmw-molecule-test_deps + - cifmw-molecule-ci_setup + - cifmw-molecule-edpm_deploy + - cifmw-molecule-hive + - cifmw-molecule-build_openstack_packages + - cifmw-molecule-operator_deploy + - cifmw-molecule-edpm_deploy_baremetal + name: openstack-k8s-operators/ci-framework