Skip to content

[kuttl] Honor cifmw_zuul_target_host_env in operator Make targets #4122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stuggi wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −3
Open

[kuttl] Honor cifmw_zuul_target_host_env in operator Make targets #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ci/playbooks/kuttl/deploy-deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,16 @@
{{
zuul.projects[project_name].src_dir
}}
# cifmw_zuul_target_host_env lets a job pass extra env vars (e.g.
# KUTTL_SUITE) into the operator Make targets, so the prep step
# deploys deps for the same suite that kuttl-test-run executes.
environment: >-
{{
{
'KUBECONFIG': cifmw_openshift_kubeconfig,
'PATH': cifmw_path | default(ansible_env.PATH),
} | combine(cifmw_zuul_target_host_env | default({}))
}}
ansible.builtin.command:
cmd: make kuttl-test-prep
chdir: "{{ ansible_user_dir }}/{{ operator_basedir }}"
Expand Down
13 changes: 10 additions & 3 deletions ci/playbooks/kuttl/run-kuttl-from-operator-targets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@
name: run_hook

- name: run kuttl test suite from operator Makefile
environment:
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
PATH: "{{ cifmw_path | default(ansible_env.PATH) }}"
# cifmw_zuul_target_host_env lets a job pass extra env vars (e.g.
# KUTTL_SUITE) into the operator Make targets. Merge it last so a job
# can override the suite selected by the operator Makefile default.
environment: >-
{{
{
'KUBECONFIG': cifmw_openshift_kubeconfig,
'PATH': cifmw_path | default(ansible_env.PATH),
} | combine(cifmw_zuul_target_host_env | default({}))
}}
ansible.builtin.command:
cmd: make kuttl-test-run
chdir: "{{ ansible_user_dir }}/{{ operator_basedir }}"
Expand Down
Loading