Fix cyclic dependency issue seen specifically with CI code (#165)

* Fixe cyclic dependency issue seen specifically with CI code * Install libX11-devel in the P10 dockerfile
open-ce · Feb 15, 2023 · cb551f1 · cb551f1
1 parent 34891cd
commit cb551f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/open_ce/build_tree.py b/open_ce/build_tree.py
@@ -509,7 +509,7 @@ def build_command_dependencies(self, node):
         for dep_package in dep_packages:
             terms += [next(x.build_command.name() for x in deps if dep_package == x.packages)]
 
-        return ", ".join(f"'{x}'" for x in terms)
+        return ", ".join(f"'{x}'" for x in terms if node.build_command.name() != x)
 
     def remove_external_deps_from_dag(self):
         '''

diff --git a/open_ce/images/builder/Dockerfile-p10 b/open_ce/images/builder/Dockerfile-p10
@@ -12,7 +12,7 @@ ENV BUILD_USER=builder
 ARG BUILD_ID=1084
 
 RUN export ARCH="$(uname -m)" && \
-    yum repolist && yum install -y rsync openssh-clients diffutils procps git-lfs gcc-toolset-11 glibc-devel file libtirpc-devel psmisc && \
+    yum repolist && yum install -y rsync openssh-clients diffutils procps git-lfs gcc-toolset-11 glibc-devel file libtirpc-devel psmisc libX11-devel && \
     # Create CICD Group
     groupadd --non-unique --gid ${GROUP_ID} ${CICD_GROUP} && \
     # Adduser Builder