Skip to content

Commit 2d171d1

Browse files
committed
ci: Move Coverity from CentOS 8 to CentOS Stream 8, part 2
Handle release "stream8" as "8" in Dockerfile templates.
1 parent f405d4a commit 2d171d1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.ci/centos/Dockerfile.deps.tmpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
dnl Coerce CentOS Stream image tags (streamN) to CentOS tags (N)
2+
define(`cosrelease', patsubst(__RELEASE__, `stream', `'))dnl
13
FROM __IMAGE__
24

35
MAINTAINER Stephen Gallagher <[email protected]>
46

57
RUN yum -y install epel-release \
6-
ifelse(eval(__RELEASE__ >= 8), 1, `dnl
8+
ifelse(eval(cosrelease >= 8), 1, `dnl
79
&& yum -y install dnf-plugins-core \
810
&& yum config-manager --enable powertools \
911
')dnl
@@ -26,7 +28,7 @@ ifelse(eval(__RELEASE__ >= 8), 1, `dnl
2628
pkgconfig \
2729
python2-devel \
2830
python2-six \
29-
ifelse(eval(__RELEASE__ < 8), 1, `dnl
31+
ifelse(eval(cosrelease < 8), 1, `dnl
3032
python-gobject-base \
3133
python36-gobject-base \
3234
',`dnl

0 commit comments

Comments
 (0)