Skip to content

Commit

Permalink
[cuebot] Fix packaging pipeline (#1525)
Browse files Browse the repository at this point in the history
Fix both the registry issues for images that rely on centos7 and the pip
package compatibility issues for python 3.6.

Some changes on PR #1416 didn't take into account that part of the
packaging pipeline relies on centos7, which doesn't support python3.7
without installing from source. On the next release, support to rhl7
might be dropped as we upgrade the pipeline to rely on rocky9.
  • Loading branch information
DiegoTavares authored Oct 2, 2024
1 parent aa3d1f9 commit 93b7652
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
5 changes: 5 additions & 0 deletions connectors/prometheus_metrics/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ ENV PYTHONUNBUFFERED 1

WORKDIR /opt/opencue

# centos:7 repos moved to vault.centos
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo

RUN yum -y install \
epel-release \
gcc \
Expand Down
5 changes: 5 additions & 0 deletions cuegui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM --platform=linux/x86_64 centos:7

WORKDIR /src

# centos:7 repos moved to vault.centos
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo

RUN yum -y install \
epel-release \
fontconfig \
Expand Down
5 changes: 5 additions & 0 deletions cuesubmit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM --platform=linux/x86_64 centos:7

WORKDIR /src

# centos:7 repos moved to vault.centos
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo

RUN yum -y install \
epel-release \
gcc \
Expand Down
12 changes: 8 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
2to3==1.0
enum34==1.1.6
future==1.0.0
grpcio==1.53.2
grpcio-tools==1.53.2
grpcio==1.48.2;python_version<"3.7"
grpcio-tools==1.48.2;python_version<"3.7"
grpcio==1.53.2;python_version>="3.7"
grpcio-tools==1.53.0;python_version>="3.7"
mock==2.0.0
packaging==20.9
psutil==5.9.8
pyfakefs==5.2.3
pylint==2.15.10
pyfakefs==3.6;python_version<"3.7"
pyfakefs==5.2.3;python_version>="3.7"
pylint==2.13.9;python_version<"3.7"
pylint==2.15.10;python_version>="3.7"
pynput==1.7.6
PyYAML==5.1
six==1.16.0
Expand Down
3 changes: 2 additions & 1 deletion requirements_gui.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PySide6==6.7.1;python_version>"3.11"
PySide6==6.5.3;python_version=="3.11"
PySide2==5.15.2.1;python_version<="3.10"
QtPy==2.4.1
QtPy==1.11.3;python_version<"3.7"
QtPy==2.4.1;python_version>="3.7"

0 comments on commit 93b7652

Please sign in to comment.