Skip to content

Commit 2b4e221

Browse files
committed
CI: Remove unnecessary conditionals
The job dependency should handle this, with the condition applied to the first job.
1 parent 978a5b3 commit 2b4e221

File tree

2 files changed

+10
-29
lines changed

2 files changed

+10
-29
lines changed

.github/path-filters.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,15 @@ aio:
88
- '.automation.conf/tempest/tempest-ci-aio.overrides.conf'
99
- '.github/workflows/stackhpc-all-in-one.yml'
1010
- '.github/workflows/stackhpc-build-kayobe-image.yml'
11-
- '.github/workflows/stackhpc-pull-request-aio.yml'
12-
- 'etc/kayobe/**'
13-
- '!etc/kayobe/ansible/**'
11+
- '.github/workflows/stackhpc-pull-request.yml'
12+
- 'etc/kayobe/*.yml'
1413
- 'etc/kayobe/ansible/configure-aio-resources.yml'
1514
- 'etc/kayobe/ansible/growroot.yml'
1615
- 'etc/kayobe/ansible/requirements.yml'
1716
- 'etc/kayobe/ansible/scripts/aio-init.sh'
18-
- '!etc/kayobe/bifrost.yml'
19-
- '!etc/kayobe/bmc.yml'
20-
- '!etc/kayobe/cephadm.yml'
21-
- '!etc/kayobe/containers/**'
22-
- '!etc/kayobe/environments/aufn-ceph/**'
23-
- '!etc/kayobe/environments/ci-builder/**'
24-
- '!etc/kayobe/environments/ci-multinode/**'
25-
- '!etc/kayobe/inspector.yml'
26-
- '!etc/kayobe/ipa.yml'
27-
- '!etc/kayobe/kolla/config/bifrost/bifrost.yml'
28-
- '!etc/kayobe/kolla/kolla-build.conf'
29-
- '!etc/kayobe/overcloud-dib.yml'
30-
- '!etc/kayobe/seed*'
31-
- '!etc/kayobe/stackhpc-overcloud-dib.yml'
32-
- '!etc/kayobe/stackhpc-overcloud-host-images.yml'
33-
- '!etc/kayobe/vault.yml'
17+
- 'etc/kayobe/environments/ci-aio/**'
18+
- 'etc/kayobe/inventory/**'
19+
- 'etc/kayobe/kolla/**'
3420
- 'kayobe-env'
3521
- 'requirements.txt'
3622
- 'terraform/aio/**'

.github/workflows/stackhpc-pull-request.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ jobs:
2121
outputs:
2222
aio: ${{ steps.changes.outputs.aio }}
2323
steps:
24+
- name: GitHub Checkout
25+
uses: actions/checkout@v3
26+
2427
- name: Check changed files
25-
uses: dorny/path-filter@v2
28+
uses: dorny/paths-filter@v2
2629
id: changes
2730
with:
2831
# Filters are defined in this file.
@@ -58,9 +61,7 @@ jobs:
5861
needs:
5962
- check-changes
6063
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
61-
if:
62-
- github.repository == 'stackhpc/stackhpc-kayobe-config'
63-
- needs.check-changes.outputs.aio == 'true'
64+
if: needs.check-changes.outputs.aio == 'true'
6465

6566
all-in-one-centos-ovs:
6667
name: aio (CentOS OVS)
@@ -72,7 +73,6 @@ jobs:
7273
neutron_plugin: ovs
7374
OS_CLOUD: sms-lab-release
7475
secrets: inherit
75-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
7676

7777
all-in-one-centos-ovn:
7878
name: aio (CentOS OVN)
@@ -84,7 +84,6 @@ jobs:
8484
neutron_plugin: ovn
8585
OS_CLOUD: sms-lab-release
8686
secrets: inherit
87-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
8887

8988
all-in-one-rocky-ovs:
9089
name: aio (Rocky OVS)
@@ -101,7 +100,6 @@ jobs:
101100
vm_interface: ens3
102101
OS_CLOUD: sms-lab-release
103102
secrets: inherit
104-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
105103

106104
all-in-one-rocky-ovn:
107105
name: aio (Rocky OVN)
@@ -118,7 +116,6 @@ jobs:
118116
vm_interface: ens3
119117
OS_CLOUD: sms-lab-release
120118
secrets: inherit
121-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
122119

123120
all-in-one-ubuntu-ovs:
124121
name: aio (Ubuntu OVS)
@@ -132,7 +129,6 @@ jobs:
132129
vm_image: Ubuntu-20.04
133130
OS_CLOUD: sms-lab-release
134131
secrets: inherit
135-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
136132

137133
all-in-one-ubuntu-ovn:
138134
name: aio (Ubuntu OVN)
@@ -146,4 +142,3 @@ jobs:
146142
vm_image: Ubuntu-20.04
147143
OS_CLOUD: sms-lab-release
148144
secrets: inherit
149-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'

0 commit comments

Comments
 (0)