Skip to content

Commit 871ce57

Browse files
elfiesmelfieelfiesmelfie
committed
Add a vars file to configure ansibletest
1 parent 48dc93e commit 871ce57

File tree

2 files changed

+65
-95
lines changed

2 files changed

+65
-95
lines changed

‎.zuul.yaml‎

Lines changed: 5 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -164,101 +164,11 @@
164164
This is a workaround for the issue described in https://github.com/openstack-k8s-operators/ci-framework/pull/3400
165165
irrelevant-files: []
166166
vars:
167-
#cifmw_test_operator_ansibletest_name: ansible-tests-cloudkitty
168-
#cifmw_test_operator_ansibletest_registry:
169-
# # (String) Registry's namespace where to pull ansibletests container. Default value: {{ cifmw_test_operator_default_namespace }}
170-
#cifmw_test_operator_ansibletest_image: "quay.io/podified-antelope-centos9/openstack-ansible-tests"
171-
#cifmw_test_operator_ansibletest_image_tag: "current-podified"
172-
#cifmw_test_operator_ansibletest_compute_ssh_key_secret_name: "dataplane-ansible-ssh-private-key-secret"
173-
# # not sure if I need this, but it is defined in the ansible-tests-cloudkitty.yaml CR
174-
#cifmw_test_operator_ansibletest_workload_ssh_key_secret_name: "dataplane-ansible-ssh-private-key-secret"
175-
# # Need to be able to pass the git branch
176-
#cifmw_test_operator_ansibletest_ansible_git_repo: "http://github.com/elfiesmelfie/feature-verification-tests"
177-
# # This goes into the stage eventually
178-
#cifmw_test_operator_ansibletest_ansible_playbook_path: "ci/run_cloudkitty_tests.yml"
179-
#cifmw_test_operator_ansibletest_ansible_collection: (String) Extra ansible collections to install in addition to the ones that exist in the requirements.yaml. Default value: ""
180-
#cifmw_test_operator_ansibletest_ansible_var_files: |
181-
# cifmw_openshift_kubeconfig: ~/.kube.config
182-
# cifmw_path: "{{ ansible_env.PATH }}:/var/lib/ansible/bin"
183-
# cifmw_openshift_api: api.crc.testing:6443
184-
# cifmw_openshift_password: '12345678'
185-
# cifmw_openshift_user: kubeadmin
186-
# openstack_cmd: "oc -n openstack rsh openstackclient openstack"
187-
# patch_observabilityclient: true
188-
#cifmw_test_operator_ansibletest_ansible_inventory: |
189-
# localhost ansible_connection=local ansible_python_interpreter=python3
190-
# compute-0 ansible_host=192.168.122.100 ansible_user=root ansible_ssh_private_key_file=/var/lib/ansible/.ssh/compute_id
191-
# compute-1 ansible_host=192.168.122.101 ansible_user=root ansible_ssh_private_key_file=/var/lib/ansible/.ssh/compute_id
192-
# [compute]
193-
# compute-0
194-
# compute-1
195-
# [controller]
196-
# localhost
197-
# [local]
198-
# localhost
199-
#cifmw_test_operator_ansibletest_debug: true
200-
#cifmw_test_operator_ansibletest_workflow:
201-
# - stepName: cloudkitty
202-
# ansiblePlaybookPath: ci/run_cloudkitty_tests.yml
203-
# debug: true
204-
# #- stepName: report-results
205-
# # ansiblePlaybookPath: ci/report_result.yml
206-
##cifmw_test_operator_ansibletest_extra_mounts:
207-
## - extraVol:
208-
## - mounts:
209-
## - name: test-operator-logs
210-
## mountPath: /var/lib/ansible/ci-framework-data/tests/feature-verification-tests
211-
## volumes: []
212-
cifmw_test_operator_ansibletest_config: |
213-
# This is a copy of ci/ansible-tests-cloudkitty
214-
# # This is a copy of ci/ansible-tests-cloudkitty.yaml
215-
apiVersion: test.openstack.org/v1beta1
216-
kind: AnsibleTest
217-
metadata:
218-
name: ansible-tests-cloudkitty
219-
namespace: openstack
220-
spec:
221-
ansibleGitRepo: 'http://github.com/elfiesmelfie/feature-verification-tests'
222-
debug: true
223-
containerImage: quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified
224-
#containerImage: quay.io/efoley/openstack-ansible-tests@sha256:9080fa1a359de1d824585ae99bcc4f34a7400fc0a29550ea6b92c44f2975901c
225-
#ansiblePlaybookPath: ci/run_verify_metrics_osp18.yml
226-
storageClass: crc-csi-hostpath-provisioner
227-
computeSSHKeySecretName: dataplane-ansible-ssh-private-key-secret
228-
workloadSSHKeySecretName: dataplane-ansible-ssh-private-key-secret
229-
ansibleVarFiles: |
230-
cifmw_openshift_kubeconfig: ~/.kube.config
231-
cifmw_path: "{{ ansible_env.PATH }}:/var/lib/ansible/bin"
232-
cifmw_openshift_api: api.crc.testing:6443
233-
cifmw_openshift_password: '12345678'
234-
cifmw_openshift_user: kubeadmin
235-
openstack_cmd: "oc -n openstack rsh openstackclient openstack"
236-
patch_observabilityclient: true
237-
ansibleCollections: 'git+https://github.com/elfiesmelfie/feature-verification-tests.git,master'
238-
privileged: false
239-
#extraMounts:
240-
# - extraVol:
241-
# - mounts:
242-
# - name: test-operator-logs
243-
# mountPath: /var/lib/ansible/ci-framework-data/tests/feature-verification-tests
244-
# volumes: []
245-
ansibleInventory: |
246-
localhost ansible_connection=local ansible_python_interpreter=python3
247-
compute-0 ansible_host=192.168.122.100 ansible_user=root ansible_ssh_private_key_file=/var/lib/ansible/.ssh/compute_id
248-
compute-1 ansible_host=192.168.122.101 ansible_user=root ansible_ssh_private_key_file=/var/lib/ansible/.ssh/compute_id
249-
[compute]
250-
compute-0
251-
compute-1
252-
[controller]
253-
localhost
254-
[local]
255-
localhost
256-
workflow:
257-
- stepName: cloudkitty
258-
ansiblePlaybookPath: ci/run_cloudkitty_tests.yml
259-
debug: true
260-
#- stepName: report-results
261-
# ansiblePlaybookPath: ci/report_result.yml
167+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
168+
# Need a config for CK
169+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-cloudkitty-tempest.yml"
170+
- "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml"
171+
- "@{{ ansible_user_dir }}/{{ zuul.prohects['github.com/infrawarch/feature-verification-tests'].src_dir }}/ci/vars-cloudkitty-fvt.yml"
262172

263173
- project:
264174
name: infrawatch/feature-verification-tests

‎ci/vars-cloudkitty-fvt.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
cifmw_test_operator_stages:
3+
#- name: tempest
4+
# type: tempest
5+
- name: cloudkitty-ansible
6+
type: ansibletest
7+
test_vars:
8+
cifmw_test_operator_ansibletest_config: |
9+
# This is a copy of ci/ansible-tests-cloudkitty
10+
# # This is a copy of ci/ansible-tests-cloudkitty.yaml
11+
apiVersion: test.openstack.org/v1beta1
12+
kind: AnsibleTest
13+
metadata:
14+
# This name needs to match the format {type}-{name} from the stages var
15+
name: ansibletest-cloudkitty-ansible
16+
namespace: openstack
17+
spec:
18+
ansibleGitRepo: http://github.com/elfiesmelfie/feature-verification-tests
19+
ansibleGitBranch: ck_tests
20+
debug: true
21+
#containerImage: quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified
22+
containerImage: quay.rdoproject.org/podified-master-centos10/openstack-ansible-tests:current-tested
23+
#containerImage: quay.io/efoley/openstack-ansible-tests@sha256:9080fa1a359de1d824585ae99bcc4f34a7400fc0a29550ea6b92c44f2975901c
24+
#ansiblePlaybookPath: ci/run_verify_metrics_osp18.yml
25+
storageClass: crc-csi-hostpath-provisioner
26+
computeSSHKeySecretName: dataplane-ansible-ssh-private-key-secret
27+
workloadSSHKeySecretName: dataplane-ansible-ssh-private-key-secret
28+
ansibleVarFiles: |
29+
cifmw_openshift_kubeconfig: ~/.kube.config
30+
cifmw_path: "{{ ansible_env.PATH }}:/var/lib/ansible/bin"
31+
cifmw_openshift_api: api.crc.testing:6443
32+
cifmw_openshift_password: '12345678'
33+
cifmw_openshift_user: kubeadmin
34+
openstack_cmd: "oc -n openstack rsh openstackclient openstack"
35+
patch_observabilityclient: true
36+
ansibleCollections: 'git+https://github.com/elfiesmelfie/feature-verification-tests.git,master'
37+
privileged: false
38+
#extraMounts:
39+
# - extraVol:
40+
# - mounts:
41+
# - name: test-operator-logs
42+
# mountPath: /var/lib/ansible/ci-framework-data/tests/feature-verification-tests
43+
# volumes: []
44+
ansibleInventory: |
45+
localhost ansible_connection=local ansible_python_interpreter=python3
46+
compute-0 ansible_host=192.168.122.100 ansible_user=root ansible_ssh_private_key_file=/var/lib/ansible/.ssh/compute_id
47+
compute-1 ansible_host=192.168.122.101 ansible_user=root ansible_ssh_private_key_file=/var/lib/ansible/.ssh/compute_id
48+
[compute]
49+
compute-0
50+
compute-1
51+
[controller]
52+
localhost
53+
[local]
54+
localhost
55+
workflow:
56+
- stepName: cloudkitty
57+
ansiblePlaybookPath: ci/run_cloudkitty_tests.yml
58+
debug: true
59+
#- stepName: report-results
60+
# ansiblePlaybookPath: ci/report_result.yml

0 commit comments

Comments
 (0)