Skip to content

Commit c73b708

Browse files
committed
ansible: use Python 3.8 in CentOS 7 container
Current versions of tap2junit require Python > 3.7. The default python3 package on CentOS 7 is Python 3.6.
1 parent 2caa7c1 commit c73b708

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

ansible/roles/docker/templates/centos7.Dockerfile.j2

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ENV DESTCPU {{ arch }}
1414
ENV ARCH {{ arch }}
1515

1616
RUN yum -y update && \
17+
yum install -y centos-release-scl && \
1718
yum install -y \
1819
gcc \
1920
gcc-c++ \
@@ -22,12 +23,12 @@ RUN yum -y update && \
2223
java-11-openjdk-headless \
2324
pkgconfig \
2425
curl \
25-
python3-pip \
26+
rh-python38-python-pip \
2627
fontconfig-devel \
2728
libtool \
2829
automake
2930

30-
RUN pip3 install tap2junit=={{ tap2junit_version }}
31+
RUN . /opt/rh/rh-python38/enable && pip3 install tap2junit=={{ tap2junit_version }}
3132

3233
RUN groupadd --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
3334

@@ -39,7 +40,6 @@ RUN yum -y install ccache
3940
RUN yum -y install glibc-devel zip unzip perl openssh-clients libgomp make scl-utils avahi kernel-devel policycoreutils-python which libgfortran
4041
RUN rpm -ivh https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-runtime-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libs-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-runtime-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-ltrace-0.7.91-17.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-strace-4.12-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-client-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-gfortran-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-binutils-2.27-12.el7.1.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-libelf-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-elfutils-0.168-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gdb-7.12.1-48.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-make-4.1-3.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-c++-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-memstomp-0.1.5-5.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-dwz-0.12-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-toolchain-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-gcc-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-valgrind-3.12.0-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-libstdc++-devel-6.3.1-3.1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-oprofile-1.1.0-4.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-systemtap-devel-3.0-8s.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-perftools-6.1-1.el7.aarch64.rpm https://buildlogs.centos.org/c7-devtoolset-6.aarch64/Packages/devtoolset-6-6.1-1.el7.aarch64.rpm
4142

42-
RUN yum -y install centos-release-scl
4343
RUN yum -y install devtoolset-8 devtoolset-8-libatomic-devel
4444

4545
VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
@@ -49,6 +49,7 @@ USER iojs:iojs
4949
ENV CCACHE_TEMPDIR /home/iojs/.ccache/{{ item.name }}
5050

5151
CMD cd /home/iojs \
52+
&& . /opt/rh/rh-python38/enable \
5253
&& curl https://ci.nodejs.org/jnlpJars/agent.jar -O \
5354
&& java -Xmx{{ server_ram|default('128m') }} \
5455
-jar /home/{{ server_user }}/agent.jar \

0 commit comments

Comments
 (0)