Skip to content

Commit 18ad16d

Browse files
Merge pull request #179 from raukadah/meta_content_provider
Use Meta content provider in tcib
2 parents b478187 + 9df5ec2 commit 18ad16d

File tree

2 files changed

+31
-24
lines changed

2 files changed

+31
-24
lines changed

zuul.d/job.yaml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
---
22
- job:
3-
name: tcib-build-containers
4-
parent: cifmw-tcib-base
5-
nodeset: centos-stream-9-vexxhost
6-
vars:
7-
cifmw_build_containers_registry_namespace: podified-antelope-centos9
8-
cifmw_build_containers_image_tag: "{{ cifmw_repo_setup_full_hash }}"
9-
irrelevant-files: &if
3+
name: tcib-podified-multinode-edpm-deployment-crc
4+
parent: podified-multinode-edpm-deployment-crc
5+
dependencies:
6+
- openstack-meta-content-provider
7+
irrelevant-files: &irrelevant_files
108
- HACKING.rst
119
- AUTHORS
1210
- .gitignore
@@ -20,29 +18,24 @@
2018
- .coveragerc
2119
- LICENSE
2220
- OWNERS*
23-
24-
- job:
25-
name: tcib-podified-multinode-edpm-deployment-crc
26-
parent: podified-multinode-edpm-deployment-crc
27-
irrelevant-files: *if
2821
vars: &edpm_vars
29-
cifmw_update_containers_registry: "{{ content_provider_registry_ip }}:5001"
30-
cifmw_update_containers_org: "podified-antelope-centos9"
31-
cifmw_update_containers_tag: "{{ content_provider_dlrn_md5_hash }}"
32-
cifmw_update_containers_openstack: true
3322
cifmw_run_test_role: test_operator
3423
cifmw_run_tempest: true
35-
cifmw_test_operator_tempest_registry: "{{ content_provider_registry_ip }}:5001"
24+
cifmw_test_operator_tempest_registry: "{{ content_provider_os_registry_url | split('/') | first }}"
25+
cifmw_test_operator_tempest_namespace: "{{ content_provider_os_registry_url | split('/') | last }}"
3626
cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash }}"
3727
cifmw_test_operator_tempest_include_list: |
3828
tempest.scenario.test_network_basic_ops.TestNetworkBasicOps
3929
cifmw_run_tobiko: true
40-
cifmw_test_operator_tobiko_registry: "{{ content_provider_registry_ip }}:5001"
30+
cifmw_test_operator_tobiko_registry: "{{ cifmw_test_operator_tempest_registry }}"
31+
cifmw_test_operator_tobiko_namespace: "{{ cifmw_test_operator_tempest_namespace }}"
4132
cifmw_test_operator_tobiko_image_tag: "{{ content_provider_dlrn_md5_hash }}"
4233
cifmw_test_operator_tobiko_testenv: "sanity"
4334

4435
- job:
4536
name: tcib-crc-podified-edpm-baremetal
4637
parent: cifmw-crc-podified-edpm-baremetal
47-
irrelevant-files: *if
38+
dependencies:
39+
- openstack-meta-content-provider
40+
irrelevant-files: *irrelevant_files
4841
vars: *edpm_vars

zuul.d/projects.yaml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,22 @@
33
name: openstack-k8s-operators/tcib
44
github-check:
55
jobs:
6-
- tcib-build-containers
7-
- tcib-crc-podified-edpm-baremetal: &content_provider
8-
dependencies:
9-
- tcib-build-containers
10-
- tcib-podified-multinode-edpm-deployment-crc: *content_provider
6+
- openstack-meta-content-provider:
7+
irrelevant-files: &if
8+
- HACKING.rst
9+
- AUTHORS
10+
- .gitignore
11+
- ^README.md$
12+
- .*/*.md
13+
- .ci-operator.yaml
14+
- .pre-commit-config.yaml
15+
- .pylintrc
16+
- .stestr.conf
17+
- .github/workflows
18+
- .coveragerc
19+
- LICENSE
20+
- OWNERS*
21+
- tcib-crc-podified-edpm-baremetal:
22+
irrelevant-files: *if
23+
- tcib-podified-multinode-edpm-deployment-crc:
24+
irrelevant-files: *if

0 commit comments

Comments
 (0)