Skip to content

Commit 82b65a0

Browse files
danpawlikdasm
danpawlik
authored and
dasm
committed
Simplify files to track by Zuul
In many places it was not necessary to add a regex, due the whole role/playbook/module should be tracked. In other words, we can live if README file would be changed and there would be a CI job running for veryfing that. Signed-off-by: Daniel Pawlik <dpawlik@redhat.com>
1 parent 6b75dcc commit 82b65a0

10 files changed

Lines changed: 133 additions & 139 deletions

File tree

‎ci/config/molecule.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
- job:
33
name: cifmw-molecule-libvirt_manager
44
files:
5-
- ^roles/dnsmasq/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
6-
- ^roles/networking_mapper/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
7-
- ^roles/config_drive/(defaults|files|handlers|library|lookup_plugins|module_utils|molecule|tasks|templates|vars).*
5+
- ^roles/dnsmasq/.*
6+
- ^roles/networking_mapper/.*
7+
- ^roles/config_drive/.*
88
timeout: 3600
99
- job:
1010
name: cifmw-molecule-openshift_login
@@ -54,12 +54,12 @@
5454
nodeset: centos-9-crc-2-48-0-xxl-ibm
5555
timeout: 5400
5656
files:
57-
- ^roles/dnsmasq/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
58-
- ^roles/libvirt_manager/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
59-
- ^roles/networking_mapper/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
60-
- ^roles/podman/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
61-
- ^roles/sushy_emulator/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
62-
- ^roles/rhol_crc/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
57+
- ^roles/dnsmasq/.*
58+
- ^roles/libvirt_manager/.*
59+
- ^roles/networking_mapper/.*
60+
- ^roles/podman/.*
61+
- ^roles/sushy_emulator/.*
62+
- ^roles/rhol_crc/.*
6363
- job:
6464
name: cifmw-molecule-cert_manager
6565
nodeset: centos-9-crc-2-48-0-xxl-ibm
@@ -69,17 +69,17 @@
6969
- job:
7070
name: cifmw_molecule-pkg_build
7171
files:
72-
- ^roles/build_openstack_packages/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
72+
- ^roles/build_openstack_packages/.*
7373
- job:
7474
name: cifmw_molecule-build_containers
7575
files:
76-
- ^roles/build_openstack_packages/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
77-
- ^roles/repo_setup/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
76+
- ^roles/build_openstack_packages/.*
77+
- ^roles/repo_setup/.*
7878
- job:
7979
name: cifmw-molecule-build_openstack_packages
8080
files:
81-
- ^roles/pkg_build/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
82-
- ^roles/repo_setup/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
81+
- ^roles/pkg_build/.*
82+
- ^roles/repo_setup/.*
8383
- job:
8484
name: cifmw-molecule-manage_secrets
8585
nodeset: centos-9-crc-2-48-0-xl-ibm

‎ci/templates/molecule.yaml.j2‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Don't modify this file.
22
# If you need apply custom molecule changes, please edit ci/config/molecule.yaml
3-
{% set want_list = ['defaults', 'files', 'handlers', 'library',
4-
'lookup_plugins', 'module_utils', 'molecule',
5-
'tasks', 'templates', 'vars'] -%}
63
{% for role_name in role_names | sort %}
74
- job:
85
name: cifmw-molecule-{{ role_name }}
@@ -12,7 +9,7 @@
129
files:
1310
- ^common-requirements.txt
1411
- ^test-requirements.txt
15-
- ^roles/{{ role_name }}/({{ want_list | sort | join('|') }}).*
12+
- ^roles/{{ role_name }}/.*
1613
- ^ci/playbooks/molecule.*
1714
- ^.config/molecule/.*
1815
{% endfor %}

‎ci/templates/noop-molecule.yaml.j2‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
{% set want_list = ['defaults', 'files', 'handlers', 'library',
2-
'lookup_plugins', 'module_utils', 'molecule',
3-
'tasks', 'templates', 'vars'] -%}
41
{% for role_name in role_names | sort %}
52
- job:
63
name: cifmw-molecule-{{ role_name }}
74
parent: cifmw-molecule-noop
85
files:
96
- ^common-requirements.txt
107
- ^test-requirements.txt
11-
- ^roles/{{ role_name }}/{{ want_list | sort | join('|') }}.*
8+
- ^roles/{{ role_name }}/.*
129
- ^ci/playbooks/molecule.*
1310
- ^.config/molecule/.*
1411
{% endfor %}

‎zuul.d/adoption.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@
120120
- ^playbooks/01-bootstrap.yml
121121
- ^playbooks/02-infra.yml
122122
- ^playbooks/06-deploy-edpm.yml
123-
- ^roles/discover_latest_image/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
124-
- ^roles/edpm_prepare/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
125-
- ^roles/install_ca/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
126-
- ^roles/install_yamls/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
127-
- ^roles/openshift_login/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
128-
- ^roles/openshift_setup/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
129-
- ^roles/repo_setup/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
123+
- ^roles/discover_latest_image/.*
124+
- ^roles/edpm_prepare/.*
125+
- ^roles/install_ca/.*
126+
- ^roles/install_yamls/.*
127+
- ^roles/openshift_login/.*
128+
- ^roles/openshift_setup/.*
129+
- ^roles/repo_setup/.*
130130
- ^hooks/playbooks/fetch_compute_facts.yml
131131
- ^zuul.d/adoption.yaml
132132
# openstack-operator

‎zuul.d/architecture-jobs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
cifmw_architecture_scenario: hci
4141
files:
4242
- zuul.d/architecture-jobs.yaml
43-
- ^roles/ci_gen_kustomize_values/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
44-
- ^roles/kustomize_deploy/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
43+
- ^roles/ci_gen_kustomize_values/.*
44+
- ^roles/kustomize_deploy/.*

‎zuul.d/content_provider.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
against ci-framework repo to validate meta content provider
2323
changes.
2424
files:
25-
- ^roles/build_containers/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
26-
- ^roles/build_openstack_packages/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
27-
- ^roles/registry_deploy/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
28-
- ^roles/edpm_build_images/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
29-
- ^roles/operator_build/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
25+
- ^roles/build_containers/.*
26+
- ^roles/build_openstack_packages/.*
27+
- ^roles/registry_deploy/.*
28+
- ^roles/edpm_build_images/.*
29+
- ^roles/operator_build/.*
3030
- ^ci/playbooks/meta_content_provider/.*

‎zuul.d/edpm.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
parent: cifmw-crc-podified-edpm-deployment
3636
files:
3737
- ^playbooks/*
38-
- ^roles/edpm_prepare/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
39-
- ^roles/edpm_deploy/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
38+
- ^roles/edpm_prepare/.*
39+
- ^roles/edpm_deploy/.*
4040
- ^roles/artifacts/tasks/edpm.yml
4141
- ^deploy-edpm.yml
4242
- ^scenarios/centos-9/edpm_ci.yml
@@ -46,7 +46,7 @@
4646
parent: cifmw-crc-podified-galera-deployment
4747
files:
4848
- ^playbooks/*
49-
- ^roles/edpm_prepare/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
49+
- ^roles/edpm_prepare/.*
5050
- ^deploy-edpm.yml
5151
- ^scenarios/centos-9/edpm_ci.yml
5252

@@ -55,7 +55,7 @@
5555
parent: cifmw-crc-podified-edpm-baremetal
5656
files:
5757
- ^playbooks/*
58-
- ^roles/edpm_deploy_baremetal/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
58+
- ^roles/edpm_deploy_baremetal/.*
5959
- ^roles/artifacts/tasks/edpm.yml
6060
- ^ci/playbooks/edpm_baremetal_deployment/run.yml
6161
- ^deploy-edpm.yml

‎zuul.d/end-to-end.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
name: cifmw-end-to-end
2424
parent: cifmw-end-to-end-base
2525
files:
26-
- ^roles/.*_build/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
27-
- ^roles/build.*/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
28-
- ^roles/openshift_.*/(defaults|files|handlers|library|lookup_plugins|module_utils|tasks|templates|vars).*
26+
- ^roles/.*_build/.*
27+
- ^roles/build.*/.*
28+
- ^roles/openshift_.*/.*
2929
- ^playbooks/.*build.*.yml
3030
irrelevant-files:
3131
- ^.*/*.md

0 commit comments

Comments
 (0)