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 28, 2024
1 parent 0d5af8b commit 61576e6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 40 deletions.
28 changes: 16 additions & 12 deletions ci/tempest/ci_fw_vars.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
---
# 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

post_ctlplane_deploy:
- name: 71 Kustomize control plane to enable heat service
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
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
target:
kind: OpenStackControlPlane
26 changes: 0 additions & 26 deletions ci/tempest/control_plane_hook.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
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 Down

0 comments on commit 61576e6

Please sign in to comment.