Skip to content

Commit

Permalink
Refactor tempest job
Browse files Browse the repository at this point in the history
Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>
  • Loading branch information
fao89 committed Oct 24, 2024
1 parent 61d18ee commit b406af1
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 42 deletions.
36 changes: 26 additions & 10 deletions ci/tempest/ci_fw_vars.yaml
Original file line number Diff line number Diff line change
@@ -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
26 changes: 0 additions & 26 deletions ci/tempest/control_plane_hook.yaml

This file was deleted.

16 changes: 11 additions & 5 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion zuul.d/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
github-check:
jobs:
- openstack-k8s-operators-content-provider
- heat-operator-tempest-multinode
- heat-operator-tempest-multinode-ceph

0 comments on commit b406af1

Please sign in to comment.