Skip to content

Commit dd303c2

Browse files
ci: matrix introduced to ci and copr fix
* used matrix instead of duplicating steps * reintroduced rpmlint to fix copr build Signed-off-by: Jasper Berton <jasper.berton@team.blue>
1 parent f4af763 commit dd303c2

File tree

2 files changed

+30
-50
lines changed

2 files changed

+30
-50
lines changed

.copr/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# requirements for automation/build.sh (see also ../ovirt-web-ui.spec.in)
44
installdeps:
5-
dnf -y install git jq rpm-build autoconf automake
5+
dnf -y install git jq rpmlint rpm-build autoconf automake
66

77
# explicity mark the copr generated git repo directory (which is done prior to the mock
88
# call to the make_srpm and will be the current pwd) as safe for git commands

.github/workflows/check.yaml

Lines changed: 29 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,64 +9,33 @@ on:
99

1010
jobs:
1111

12-
test_el9_offline:
13-
name: EL9 (ovirt-engine-nodejs-modules build) - test, build and publish rpm repo for the PR
14-
env:
15-
OFFLINE_BUILD: 1
16-
17-
runs-on: ubuntu-latest
18-
container:
19-
image: quay.io/ovirt/buildcontainer:el9stream
20-
21-
steps:
22-
- name: Checkout sources
23-
uses: ovirt/checkout-action@main
24-
25-
- name: install rpmlint
26-
run: dnf -y install rpmlint
27-
28-
- name: Run automation/build.sh (installs build dependencies as necessary)
29-
run: ./automation/build.sh
30-
31-
- name: Upload artifacts as rpm repo
32-
uses: ovirt/upload-rpms-action@main
33-
with:
34-
directory: exported-artifacts/
35-
36-
test_el9_online:
37-
name: EL9 (online build) test and build the PR, but skip the rpm builds
12+
test_offline:
3813
runs-on: ubuntu-latest
39-
container:
40-
image: quay.io/ovirt/buildcontainer:el9stream
41-
steps:
42-
- name: Install yarn (online mode does not use ovirt-engine-nodejs-modules so yarn isn't installed)
43-
run: |
44-
dnf -y config-manager --add-repo https://dl.yarnpkg.com/rpm/yarn.repo
45-
dnf -y --disablerepo='*' --enablerepo='yarn*' install yarn
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
include:
18+
- name: centos-stream9
19+
container-name: el9stream
20+
- name: centos-stream10
21+
container-name: el10stream
4622

47-
- name: Checkout sources
48-
uses: ovirt/checkout-action@main
23+
name: ${{ matrix.name }} (ovirt-engine-nodejs-modules build) - test, build and publish rpm repo for the PR
4924

50-
- name: Run 'yarn install' and 'yarn build' (like a developer would)
51-
run: |
52-
yarn install
53-
yarn build
54-
55-
test_el10_offline:
56-
name: EL10 (ovirt-engine-nodejs-modules build) - test, build and publish rpm repo for the PR
5725
env:
5826
OFFLINE_BUILD: 1
5927

60-
runs-on: ubuntu-latest
6128
container:
62-
image: quay.io/ovirt/buildcontainer:el10stream
29+
image: quay.io/ovirt/buildcontainer:${{ matrix.container-name }}
6330

6431
steps:
6532
- name: Checkout sources
6633
uses: ovirt/checkout-action@main
67-
34+
6835
- name: install rpmlint
69-
run: pip install rpmlint
36+
run: |
37+
dnf -y install epel-release
38+
dnf -y install rpmlint
7039
7140
- name: Run automation/build.sh (installs build dependencies as necessary)
7241
run: ./automation/build.sh
@@ -76,11 +45,22 @@ jobs:
7645
with:
7746
directory: exported-artifacts/
7847

79-
test_el10_online:
80-
name: EL10 (online build) test and build the PR, but skip the rpm builds
48+
test_online:
8149
runs-on: ubuntu-latest
50+
strategy:
51+
fail-fast: false
52+
matrix:
53+
include:
54+
- name: centos-stream9
55+
container-name: el9stream
56+
- name: centos-stream10
57+
container-name: el10stream
58+
59+
name: ${{ matrix.name }} (online build) test and build the PR, but skip the rpm builds
60+
8261
container:
83-
image: quay.io/ovirt/buildcontainer:el10stream
62+
image: quay.io/ovirt/buildcontainer:${{ matrix.container-name }}
63+
8464
steps:
8565
- name: Install yarn (online mode does not use ovirt-engine-nodejs-modules so yarn isn't installed)
8666
run: |

0 commit comments

Comments
 (0)