diff --git a/ansible.cfg b/ansible.cfg index cd79ebec6..6fd4ac950 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,4 +1,4 @@ [defaults] retry_files_enabled = False host_key_checking=False -stdout_callback = validation_output +stdout_callback = default diff --git a/roles/image_serve/molecule/default/molecule.yml b/roles/image_serve/molecule/default/molecule.yml index ce6e3380d..ce6705b32 100644 --- a/roles/image_serve/molecule/default/molecule.yml +++ b/roles/image_serve/molecule/default/molecule.yml @@ -7,7 +7,7 @@ log: true platforms: - name: ubi8 hostname: ubi8 - image: ubi8/ubi-init + image: ubi8/ubi:8.2 registry: url: registry.access.redhat.com etc_hosts: @@ -29,6 +29,8 @@ platforms: provisioner: name: ansible + options: + vvv: true inventory: hosts: all: diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml new file mode 100644 index 000000000..8f6677035 --- /dev/null +++ b/zuul.d/base.yaml @@ -0,0 +1,15 @@ +--- +- job: + description: Base tripleo-validations job + name: tripleo-validations-centos-8-base + nodeset: centos-8 + parent: base + success-url: "reports.html" + failure-url: "reports.html" + pre-run: + - tests/prepare-test-host.yml + - ci/playbooks/pre.yml + run: + - ci/playbooks/run.yml + timeout: 1800 + voting: true diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml new file mode 100644 index 000000000..7c1851609 --- /dev/null +++ b/zuul.d/layout.yaml @@ -0,0 +1,38 @@ +--- +- project: + templates: + - tripleo-multinode-container-minimal-pipeline + - openstack-python3-wallaby-jobs + - tripleo-validations-molecule-jobs + - release-notes-jobs-python3 + check: + jobs: + - openstack-tox-linters: &tripleo-linters + nodeset: centos-8 + - openstack-tox-docs: &tripleo-docs + files: + - ^doc/.* + - ^molecule-requirements.txt + - ^requirements.txt + - ^README.rst + - tripleo-ci-centos-8-content-provider: &content-provider + dependencies: + - openstack-tox-linters + - tripleo-ci-centos-8-scenario004-standalone: &scenario004 + vars: &vars_scen004 + consumer_job: true + build_container_images: false + dependencies: &deps + - tripleo-ci-centos-8-content-provider + files: + - ^roles/ceph.*$ + gate: + jobs: + - openstack-tox-linters + - openstack-tox-docs: *tripleo-docs + - tripleo-ci-centos-8-content-provider: *content-provider + - tripleo-ci-centos-8-scenario004-standalone: *scenario004 + + promote: + jobs: + - promote-openstack-tox-docs: *tripleo-docs diff --git a/.zuul.yaml b/zuul.d/molecule.yaml similarity index 59% rename from .zuul.yaml rename to zuul.d/molecule.yaml index 2fd692800..237ab964a 100644 --- a/.zuul.yaml +++ b/zuul.d/molecule.yaml @@ -1,106 +1,52 @@ --- -- job: - description: Base tripleo-validations job - name: tripleo-validations-centos-8-base - nodeset: centos-8 - parent: base - success-url: "reports.html" - failure-url: "reports.html" - pre-run: - - tests/prepare-test-host.yml - - ci/playbooks/pre.yml - run: - - ci/playbooks/run.yml - timeout: 1800 - voting: true - -- project: - templates: - - tripleo-multinode-container-minimal-pipeline - - openstack-python3-wallaby-jobs - - tripleo-validations-molecule-jobs - - release-notes-jobs-python3 - check: - jobs: - - openstack-tox-linters: &tripleo-linters - nodeset: centos-8 - - openstack-tox-docs: &tripleo-docs - files: - - ^doc/.* - - ^molecule-requirements.txt - - ^requirements.txt - - ^README.rst - - tripleo-ci-centos-8-content-provider: &content-provider - dependencies: - - openstack-tox-linters - - tripleo-ci-centos-8-scenario004-standalone: &scenario004 - vars: &vars_scen004 - consumer_job: true - build_container_images: false - dependencies: &deps - - tripleo-ci-centos-8-content-provider - files: - - ^roles/ceph.*$ - gate: - jobs: - - openstack-tox-linters - - openstack-tox-docs: *tripleo-docs - - tripleo-ci-centos-8-content-provider: *content-provider - - tripleo-ci-centos-8-scenario004-standalone: *scenario004 - - promote: - jobs: - - promote-openstack-tox-docs: *tripleo-docs - - project-template: check: jobs: - - tripleo-validations-centos-8-molecule-ceph - - tripleo-validations-centos-8-molecule-check_network_gateway - - tripleo-validations-centos-8-molecule-check_rhsm_version - - tripleo-validations-centos-8-molecule-check_undercloud_conf - - tripleo-validations-centos-8-molecule-controller_token - - tripleo-validations-centos-8-molecule-controller_ulimits - - tripleo-validations-centos-8-molecule-ctlplane_ip_range - - tripleo-validations-centos-8-molecule-image_serve - - tripleo-validations-centos-8-molecule-nova_status - - tripleo-validations-centos-8-molecule-nova_svirt - - tripleo-validations-centos-8-molecule-package_version - - tripleo-validations-centos-8-molecule-rabbitmq_limits - - tripleo-validations-centos-8-molecule-repos - - tripleo-validations-centos-8-molecule-stonith_exists - - tripleo-validations-centos-8-molecule-system_encoding - - tripleo-validations-centos-8-molecule-tls_everywhere - - tripleo-validations-centos-8-molecule-undercloud_debug - - tripleo-validations-centos-8-molecule-undercloud_heat_purge_deleted - - tripleo-validations-centos-8-molecule-undercloud_tokenflush - - tripleo-validations-centos-8-molecule-check_kernel_version + - tripleo-validations-centos-8-molecule-ceph + - tripleo-validations-centos-8-molecule-check_kernel_version + - tripleo-validations-centos-8-molecule-check_network_gateway + - tripleo-validations-centos-8-molecule-check_rhsm_version + - tripleo-validations-centos-8-molecule-check_undercloud_conf + - tripleo-validations-centos-8-molecule-controller_token + - tripleo-validations-centos-8-molecule-controller_ulimits + - tripleo-validations-centos-8-molecule-ctlplane_ip_range + - tripleo-validations-centos-8-molecule-image_serve + - tripleo-validations-centos-8-molecule-nova_status + - tripleo-validations-centos-8-molecule-nova_svirt + - tripleo-validations-centos-8-molecule-package_version + - tripleo-validations-centos-8-molecule-rabbitmq_limits + - tripleo-validations-centos-8-molecule-repos + - tripleo-validations-centos-8-molecule-stonith_exists + - tripleo-validations-centos-8-molecule-system_encoding + - tripleo-validations-centos-8-molecule-tls_everywhere + - tripleo-validations-centos-8-molecule-undercloud_debug + - tripleo-validations-centos-8-molecule-undercloud_heat_purge_deleted + - tripleo-validations-centos-8-molecule-undercloud_tokenflush gate: jobs: - - tripleo-validations-centos-8-molecule-ceph - - tripleo-validations-centos-8-molecule-check_network_gateway - - tripleo-validations-centos-8-molecule-check_rhsm_version - - tripleo-validations-centos-8-molecule-check_undercloud_conf - - tripleo-validations-centos-8-molecule-controller_token - - tripleo-validations-centos-8-molecule-controller_ulimits - - tripleo-validations-centos-8-molecule-ctlplane_ip_range - - tripleo-validations-centos-8-molecule-image_serve - - tripleo-validations-centos-8-molecule-nova_status - - tripleo-validations-centos-8-molecule-nova_svirt - - tripleo-validations-centos-8-molecule-package_version - - tripleo-validations-centos-8-molecule-rabbitmq_limits - - tripleo-validations-centos-8-molecule-repos - - tripleo-validations-centos-8-molecule-stonith_exists - - tripleo-validations-centos-8-molecule-system_encoding - - tripleo-validations-centos-8-molecule-tls_everywhere - - tripleo-validations-centos-8-molecule-undercloud_debug - - tripleo-validations-centos-8-molecule-undercloud_heat_purge_deleted - - tripleo-validations-centos-8-molecule-undercloud_tokenflush - - tripleo-validations-centos-8-molecule-check_kernel_version + - tripleo-validations-centos-8-molecule-ceph + - tripleo-validations-centos-8-molecule-check_kernel_version + - tripleo-validations-centos-8-molecule-check_network_gateway + - tripleo-validations-centos-8-molecule-check_rhsm_version + - tripleo-validations-centos-8-molecule-check_undercloud_conf + - tripleo-validations-centos-8-molecule-controller_token + - tripleo-validations-centos-8-molecule-controller_ulimits + - tripleo-validations-centos-8-molecule-ctlplane_ip_range + - tripleo-validations-centos-8-molecule-nova_status + - tripleo-validations-centos-8-molecule-nova_svirt + - tripleo-validations-centos-8-molecule-package_version + - tripleo-validations-centos-8-molecule-rabbitmq_limits + - tripleo-validations-centos-8-molecule-repos + - tripleo-validations-centos-8-molecule-stonith_exists + - tripleo-validations-centos-8-molecule-system_encoding + - tripleo-validations-centos-8-molecule-tls_everywhere + - tripleo-validations-centos-8-molecule-undercloud_debug + - tripleo-validations-centos-8-molecule-undercloud_heat_purge_deleted + - tripleo-validations-centos-8-molecule-undercloud_tokenflush name: tripleo-validations-molecule-jobs - job: files: - - ^roles/collect_flavors_and_verify_profiles/.* + - ^roles/collect_flavors_and_verify_profiles/.* name: tripleo-validations-centos-8-molecule-collect_flavors_and_verify_profiles parent: tripleo-validations-centos-8-base vars: @@ -108,7 +54,7 @@ voting: false - job: files: - - ^roles/ceilometerdb_size/.* + - ^roles/ceilometerdb_size/.* name: tripleo-validations-centos-8-molecule-ceilometerdb_size parent: tripleo-validations-centos-8-base vars: @@ -116,7 +62,7 @@ voting: false - job: files: - - ^roles/neutron_sanity_check/.* + - ^roles/neutron_sanity_check/.* name: tripleo-validations-centos-8-molecule-neutron_sanity_check parent: tripleo-validations-centos-8-base vars: @@ -124,7 +70,7 @@ voting: false - job: files: - - ^roles/node_health/.* + - ^roles/node_health/.* name: tripleo-validations-centos-8-molecule-node_health parent: tripleo-validations-centos-8-base vars: @@ -132,7 +78,7 @@ voting: false - job: files: - - ^roles/nova_event_callback/.* + - ^roles/nova_event_callback/.* name: tripleo-validations-centos-8-molecule-nova_event_callback parent: tripleo-validations-centos-8-base vars: @@ -140,7 +86,7 @@ voting: false - job: files: - - ^roles/ovs_dpdk_pmd/.* + - ^roles/ovs_dpdk_pmd/.* name: tripleo-validations-centos-8-molecule-ovs_dpdk_pmd parent: tripleo-validations-centos-8-base vars: @@ -148,7 +94,7 @@ voting: false - job: files: - - ^roles/pacemaker_status/.* + - ^roles/pacemaker_status/.* name: tripleo-validations-centos-8-molecule-pacemaker_status parent: tripleo-validations-centos-8-base vars: @@ -156,7 +102,7 @@ voting: false - job: files: - - ^roles/stack_health/.* + - ^roles/stack_health/.* name: tripleo-validations-centos-8-molecule-stack_health parent: tripleo-validations-centos-8-base vars: @@ -164,7 +110,7 @@ voting: false - job: files: - - ^roles/switch_vlans/.* + - ^roles/switch_vlans/.* name: tripleo-validations-centos-8-molecule-switch_vlans parent: tripleo-validations-centos-8-base vars: @@ -172,7 +118,7 @@ voting: false - job: files: - - ^roles/tls_everywhere/.* + - ^roles/tls_everywhere/.* name: tripleo-validations-centos-8-molecule-tls_everywhere parent: tripleo-validations-centos-8-base vars: @@ -180,7 +126,7 @@ voting: true - job: files: - - ^roles/undercloud_process_count/.* + - ^roles/undercloud_process_count/.* name: tripleo-validations-centos-8-molecule-undercloud_process_count parent: tripleo-validations-centos-8-base vars: @@ -188,7 +134,7 @@ voting: false - job: files: - - ^roles/openstack_endpoints/.* + - ^roles/openstack_endpoints/.* name: tripleo-validations-centos-8-molecule-openstack_endpoints parent: tripleo-validations-centos-8-base vars: @@ -196,7 +142,7 @@ voting: false - job: files: - - ^roles/openshift_on_openstack/.* + - ^roles/openshift_on_openstack/.* name: tripleo-validations-centos-8-molecule-openshift_on_openstack parent: tripleo-validations-centos-8-base vars: @@ -204,7 +150,7 @@ voting: false - job: files: - - ^roles/node_disks/.* + - ^roles/node_disks/.* name: tripleo-validations-centos-8-molecule-node_disks parent: tripleo-validations-centos-8-base vars: @@ -212,7 +158,7 @@ voting: false - job: files: - - ^roles/container_status/.* + - ^roles/container_status/.* name: tripleo-validations-centos-8-molecule-container_status parent: tripleo-validations-centos-8-base vars: @@ -220,7 +166,7 @@ voting: false - job: files: - - ^roles/healthcheck_service_status/.* + - ^roles/healthcheck_service_status/.* name: tripleo-validations-centos-8-molecule-healthcheck_service_status parent: tripleo-validations-centos-8-base vars: @@ -228,7 +174,7 @@ voting: false - job: files: - - ^roles/ironic_boot_configuration/.* + - ^roles/ironic_boot_configuration/.* name: tripleo-validations-centos-8-molecule-ironic_boot_configuration parent: tripleo-validations-centos-8-base vars: @@ -236,7 +182,7 @@ voting: false - job: files: - - ^roles/mysql_open_files_limit/.* + - ^roles/mysql_open_files_limit/.* name: tripleo-validations-centos-8-molecule-mysql_open_files_limit parent: tripleo-validations-centos-8-base vars: @@ -244,7 +190,7 @@ voting: false - job: files: - - ^roles/network_environment/.* + - ^roles/network_environment/.* name: tripleo-validations-centos-8-molecule-network_environment parent: tripleo-validations-centos-8-base vars: @@ -252,7 +198,7 @@ voting: false - job: files: - - ^roles/dhcp_validations/.* + - ^roles/dhcp_validations/.* name: tripleo-validations-centos-8-molecule-dhcp_validations parent: tripleo-validations-centos-8-base vars: @@ -260,56 +206,57 @@ voting: false - job: files: - - ^roles/controller_token/.* + - ^roles/controller_token/.* name: tripleo-validations-centos-8-molecule-controller_token parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: controller_token - job: files: - - ^roles/controller_ulimits/.* + - ^roles/controller_ulimits/.* name: tripleo-validations-centos-8-molecule-controller_ulimits parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: controller_ulimits - job: files: - - ^roles/ctlplane_ip_range/.* + - ^roles/ctlplane_ip_range/.* name: tripleo-validations-centos-8-molecule-ctlplane_ip_range parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: ctlplane_ip_range - job: files: - - ^roles/repos/.* + - ^roles/repos/.* name: tripleo-validations-centos-8-molecule-repos parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: repos - job: files: - - ^roles/undercloud_debug/.* + - ^roles/undercloud_debug/.* name: tripleo-validations-centos-8-molecule-undercloud_debug parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: undercloud_debug - job: files: - - ^roles/nova_status/.* + - ^roles/nova_status/.* name: tripleo-validations-centos-8-molecule-nova_status parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: nova_status - job: files: - - ^roles/image_serve/.* + - ^roles/image_serve/.* name: tripleo-validations-centos-8-molecule-image_serve parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: image_serve + voting: false - job: files: - - ^roles/check_network_gateway/.* + - ^roles/check_network_gateway/.* name: tripleo-validations-centos-8-molecule-check_network_gateway parent: tripleo-validations-centos-8-base vars: @@ -317,77 +264,77 @@ voting: false - job: files: - - ^roles/undercloud_heat_purge_deleted/.* + - ^roles/undercloud_heat_purge_deleted/.* name: tripleo-validations-centos-8-molecule-undercloud_heat_purge_deleted parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: undercloud_heat_purge_deleted - job: files: - - ^roles/undercloud_tokenflush/.* + - ^roles/undercloud_tokenflush/.* name: tripleo-validations-centos-8-molecule-undercloud_tokenflush parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: undercloud_tokenflush - job: files: - - ^roles/rabbitmq_limits/.* + - ^roles/rabbitmq_limits/.* name: tripleo-validations-centos-8-molecule-rabbitmq_limits parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: rabbitmq_limits - job: files: - - ^roles/stonith_exists/.* + - ^roles/stonith_exists/.* name: tripleo-validations-centos-8-molecule-stonith_exists parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: stonith_exists - job: files: - - ^roles/ceph/.* + - ^roles/ceph/.* name: tripleo-validations-centos-8-molecule-ceph parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: ceph - job: files: - - ^roles/system_encoding/.* + - ^roles/system_encoding/.* name: tripleo-validations-centos-8-molecule-system_encoding parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: system_encoding - job: files: - - ^roles/nova_svirt/.* + - ^roles/nova_svirt/.* name: tripleo-validations-centos-8-molecule-nova_svirt parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: nova_svirt - job: files: - - ^roles/package_version/.* + - ^roles/package_version/.* name: tripleo-validations-centos-8-molecule-package_version parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: package_version - job: files: - - ^roles/check_kernel_version/.* + - ^roles/check_kernel_version/.* name: tripleo-validations-centos-8-molecule-check_kernel_version parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: check_kernel_version - job: files: - - ^roles/check_rhsm_version/.* + - ^roles/check_rhsm_version/.* name: tripleo-validations-centos-8-molecule-check_rhsm_version parent: tripleo-validations-centos-8-base vars: tripleo_validations_role_name: check_rhsm_version - job: files: - - ^roles/check_undercloud_conf/.* + - ^roles/check_undercloud_conf/.* name: tripleo-validations-centos-8-molecule-check_undercloud_conf parent: tripleo-validations-centos-8-base vars: