From b406af128bc3d921e2f188933c6c2b8b0c3acaf3 Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Thu, 24 Oct 2024 15:50:18 +0100 Subject: [PATCH] Refactor tempest job Signed-off-by: Fabricio Aguiar --- ci/tempest/ci_fw_vars.yaml | 36 +++++++++++++++++++++--------- ci/tempest/control_plane_hook.yaml | 26 --------------------- zuul.d/jobs.yaml | 16 ++++++++----- zuul.d/project.yaml | 2 +- 4 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 ci/tempest/control_plane_hook.yaml diff --git a/ci/tempest/ci_fw_vars.yaml b/ci/tempest/ci_fw_vars.yaml index 73b00909..6224a487 100644 --- a/ci/tempest/ci_fw_vars.yaml +++ b/ci/tempest/ci_fw_vars.yaml @@ -1,13 +1,29 @@ --- -# note by default the source for the playbook specified -# in the hooks is relative to -# https://github.com/openstack-k8s-operators/ci-framework/tree/main/hooks/playbooks -# if you want to use a different source you can use the full path on the ansible controller +cifmw_edpm_prepare_timeout: 60 +cifmw_edpm_prepare_kustomizations: + - apiVersion: kustomize.config.k8s.io/v1beta1 + kind: Kustomization + namespace: openstack + patches: + - patch: |- + apiVersion: core.openstack.org/v1beta1 + kind: OpenStackControlPlane + metadata: + name: unused + spec: + heat: + enabled: true + telemetry: + template: + autoscaling: + enabled: true + target: + kind: OpenStackControlPlane -post_ctlplane_deploy: - - name: 71 Kustomize control plane to enable heat service +# we can use this hook to create flavors, images, etc +# before we execute tempest simiilar to how we would use +# local.sh in devstack based jobs +pre_tests: + - name: 01 Create cinder multiattach volume type type: playbook - source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/heat-operator'].src_dir }}/ci/tempest/control_plane_hook.yaml" - - name: 82 Kustomize and update Control Plane - type: playbook - source: control_plane_kustomize_deploy.yml + source: cinder_multiattach_volume_type.yml diff --git a/ci/tempest/control_plane_hook.yaml b/ci/tempest/control_plane_hook.yaml deleted file mode 100644 index e196cd9d..00000000 --- a/ci/tempest/control_plane_hook.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: Kustomize ControlPlane - hosts: "{{ cifmw_target_hook_host | default('localhost') }}" - gather_facts: false - tasks: - - name: Ensure the kustomizations dir exists - ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane" - state: directory - mode: "0755" - - - name: Create kustomization - ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/71-controlplane-kustomization.yaml" - content: |- - apiVersion: kustomize.config.k8s.io/v1beta1 - kind: Kustomization - resources: - namespace: {{ cifmw_install_yamls_defaults['NAMESPACE'] }} - patches: - - target: - kind: OpenStackControlPlane - patch: |- - - op: replace - path: /spec/heat/enabled - value: true diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index fd7a38f6..893167d4 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1,18 +1,18 @@ --- - job: - name: heat-operator-tempest-multinode - parent: podified-multinode-edpm-deployment-crc + name: heat-operator-tempest-multinode-ceph + parent: podified-multinode-hci-deployment-crc-1comp-backends dependencies: ["openstack-k8s-operators-content-provider"] vars: cifmw_extras: - "@scenarios/centos-9/multinode-ci.yml" + - "@scenarios/centos-9/hci_ceph_backends.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/heat-operator'].src_dir }}/ci/tempest/ci_fw_vars.yaml" cifmw_run_test_role: test_operator cifmw_test_operator_concurrency: 4 cifmw_test_operator_timeout: 7200 cifmw_test_operator_tempest_network_attachments: - - ctlplane - # This value is used to populate the `tempestconfRun` parameter of the Tempest CR: https://openstack-k8s-operators.github.io/test-operator/crds.html#tempest-custom-resource + - ctlplane # This value is used to populate the `tempestconfRun` parameter of the Tempest CR: https://openstack-k8s-operators.github.io/test-operator/crds.html#tempest-custom-resource # https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/test_operator/defaults/main.yml # NOTE(gibi): identity.v3_endpoint_type override is a WA to force the # publicURL as otherwise tempest gets configured with adminURL and that @@ -23,13 +23,19 @@ validation.run_validation true identity.v3_endpoint_type public identity.v2_admin_endpoint_type public + volume.volume_type_multiattach multiattach + volume.storage_protocol ceph + heat_plugin.vm_to_heat_api_insecure true + heat_plugin.dns_servers "192.168.122.80" + share.run_share_group_tests false + share.capability_storage_protocol cephfs + share.suppress_errors_in_cleanup true cifmw_test_operator_tempest_include_list: | heat_tempest_plugin.* cifmw_test_operator_tempest_exclude_list: | heat_tempest_plugin.tests.functional.test_os_wait_condition.OSWaitCondition.test_create_stack_with_multi_signal_waitcondition heat_tempest_plugin.tests.scenario.test_server_cfn_init.CfnInitIntegrationTest.test_server_cfn_init heat_tempest_plugin.tests.scenario.test_aodh_alarm.AodhAlarmTest.test_alarm - heat_tempest_plugin.tests.scenario.test_base_resources.BasicResourcesTest.test_base_resources_integration heat_tempest_plugin.tests.scenario.test_server_signal.ServerSignalIntegrationTest.test_server_signal_userdata_format_raw heat_tempest_plugin.tests.scenario.test_server_signal.ServerSignalIntegrationTest.test_server_signal_userdata_format_software_config heat_tempest_plugin.tests.scenario.test_server_software_config.SoftwareConfigIntegrationTest.test_server_software_config diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 388c77be..867b6e35 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -4,4 +4,4 @@ github-check: jobs: - openstack-k8s-operators-content-provider - - heat-operator-tempest-multinode + - heat-operator-tempest-multinode-ceph