From 00cbe97f4f8b3227d27b4ce279178b27a595896e Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 4 Aug 2021 20:57:08 -0700 Subject: [PATCH] EX-3587 build: Use explicit python2 Use explicit python2 since lipe is not ready to move to python3 yet Change-Id: I289775f522d0f0e284fc8cfba3ca1737f3e27c79 Test-Parameters: trivial Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/44503 Reviewed-by: Jian Yu Tested-by: jenkins Tested-by: Maloo Reviewed-by: John L. Hammond --- lipe/lipe-docker-build/lipe-iso-build/Dockerfile | 6 +++--- lipe/lipe.spec.in | 2 +- lipe/pylipe/lipe_common.py | 4 ++-- lipe/pylipe/lipe_install.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lipe/lipe-docker-build/lipe-iso-build/Dockerfile b/lipe/lipe-docker-build/lipe-iso-build/Dockerfile index f41d402..f1d83f0 100644 --- a/lipe/lipe-docker-build/lipe-iso-build/Dockerfile +++ b/lipe/lipe-docker-build/lipe-iso-build/Dockerfile @@ -3,9 +3,9 @@ MAINTAINER Minh Diep # Require to build RUN yum install -y \ - PyYAML \ - python-filelock \ - python-dateutil + PyYAMLPyYAML \ + python2-filelock \ + python2-dateutil RUN sed -i -e "s/^\(Defaults\s\+requiretty.*\)/#\1/" /etc/sudoers diff --git a/lipe/lipe.spec.in b/lipe/lipe.spec.in index f53e70f..2dffcba 100644 --- a/lipe/lipe.spec.in +++ b/lipe/lipe.spec.in @@ -30,7 +30,7 @@ Group: Applications/System Source0: @PACKAGE@-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: lipe-pylustre = %{version}-%{release} -Requires: rsync json-c libyaml PyYAML python2-filelock python-dateutil +Requires: rsync json-c libyaml python2-pyyaml python2-filelock python2-dateutil Requires: e2fsprogs >= 1.42.13.wc6 Provides: lipe = %{version}-%{release} %if %{with systemd} diff --git a/lipe/pylipe/lipe_common.py b/lipe/pylipe/lipe_common.py index 2c7cc9d..3e17342 100644 --- a/lipe/pylipe/lipe_common.py +++ b/lipe/pylipe/lipe_common.py @@ -5,9 +5,9 @@ LIPE_PIP_LIBS = [] LIPE_DEPENDENT_RPMS = ["python2-pip", "rsync", "libyaml", - "PyYAML", + "python2-pyyaml", "python2-filelock", - "python-dateutil", + "python2-dateutil", "protobuf-python", "libssh", "json-c"] diff --git a/lipe/pylipe/lipe_install.py b/lipe/pylipe/lipe_install.py index b3a59d5..8157cf1 100644 --- a/lipe/pylipe/lipe_install.py +++ b/lipe/pylipe/lipe_install.py @@ -21,7 +21,7 @@ def main(): try: import yaml except ImportError: - missing_dependencies.append("PyYAML") + missing_dependencies.append("python2-pyyaml") try: import filelock @@ -31,7 +31,7 @@ def main(): try: import dateutil except ImportError: - missing_dependencies.append("python-dateutil") + missing_dependencies.append("python2-dateutil") local_host = ssh_host.SSHHost("localhost", local=True) for dependent_rpm in install_common.LIPE_INSTALL_DEPENDENT_RPMS: -- 1.8.3.1