Skip to content

Commit 2c4fb8d

Browse files
authored
Merge pull request #100 from oVirt/test.ovirtCI.versions
Test package versions by oVirt CI
2 parents 45f2f7c + d7f45bc commit 2c4fb8d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

automation/build-artifacts.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
shopt -s nullglob
44

55
dependencies="$(sed -e '/^[ \t]*$/d' -e '/^#/d' automation/packages.force)"
6-
# yum clean metadata || dnf clean metadata
7-
# yum -y install ${dependencies} || dnf -y install ${dependencies}
86
yum-deprecated clean metadata || yum clean metadata
97
yum-deprecated -y install ${dependencies} || yum -y install ${dependencies}
108

@@ -22,8 +20,10 @@ echo === In build-artifacts.sh: PATH=${PATH}
2220
rpm -qa | grep ovirt-engine-nodejs
2321
./autogen.sh
2422

25-
# create rpm
23+
# install deps
2624
yum-builddep ovirt-web-ui.spec
25+
26+
# create rpm
2727
make rpm
2828
cp *.tar.gz tmp.repos/
2929

automation/check-patch.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
# Force CI to get the latest version of these packages:
44
dependencies="$(sed -e '/^[ \t]*$/d' -e '/^#/d' automation/packages.force)"
5-
# yum clean metadata || dnf clean metadata
6-
# yum -y install ${dependencies} || dnf -y install ${dependencies}
75
yum-deprecated clean metadata || yum clean metadata
86
yum-deprecated -y install ${dependencies} || yum -y install ${dependencies}
97

108
export PATH=/usr/share/ovirt-engine-nodejs/bin:/usr/share/ovirt-engine-yarn/bin:${PATH}
119
echo === In check-patch.sh: PATH=${PATH}
1210
rpm -qa | grep ovirt-engine-nodejs
13-
source /usr/share/ovirt-engine-nodejs-modules/setup-env.sh
14-
./autogen.sh && make check-local
1511

12+
source /usr/share/ovirt-engine-nodejs-modules/setup-env.sh
13+
./autogen.sh && \
14+
make check-local && \
15+
make snapshot-rpm

0 commit comments

Comments
 (0)