From 5d4240c60768e1a7103156766aa4d8d71e11067f Mon Sep 17 00:00:00 2001 From: Sanketh I Date: Mon, 1 Jul 2024 10:28:18 -0700 Subject: [PATCH] [BACKPORT 2.18.8] [PLAT-14543] Build break fix for centos7 Summary: Original diff: https://phorge.dev.yugabyte.com/D36280 Test Plan: dev itest Reviewers: muthu, dshubin, steve.varnau, cwang Reviewed By: steve.varnau, cwang Subscribers: jharveysmith, yugaware Tags: #jenkins-ready Differential Revision: https://phorge.dev.yugabyte.com/D36533 --- managed/devops/pex/Dockerfile | 6 ++++++ managed/devops/yb_release | 6 +++--- managed/devops/yb_release_manifest.json | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/managed/devops/pex/Dockerfile b/managed/devops/pex/Dockerfile index 3235bf4d3cb5..484c24c4c2fb 100755 --- a/managed/devops/pex/Dockerfile +++ b/managed/devops/pex/Dockerfile @@ -1,6 +1,12 @@ # Get the latest docker image FROM quay.io/pypa/manylinux2014_x86_64 + +RUN sed -i 's/mirrorlist=/#mirrorlist=/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' \ + /etc/yum.repos.d/CentOS-* + + # Perform general yum updates RUN yum --enablerepo=extras -y install epel-release python3-pip RUN pip3 install --upgrade pip diff --git a/managed/devops/yb_release b/managed/devops/yb_release index 513eb9391688..c83e866a29d1 100755 --- a/managed/devops/yb_release +++ b/managed/devops/yb_release @@ -20,9 +20,9 @@ activate_virtualenv bin/install_ansible_requirements.sh --force # Python modules build for yugabundle. -cd "$yb_devops_home" -docker build -t "$DOCKER_VENV_IMAGE_NAME" . -docker run -v "$yb_devops_home:/devops" -u "$UID:$(id -g $UID)" "$DOCKER_VENV_IMAGE_NAME" +# cd "$yb_devops_home" +# docker build -t "$DOCKER_VENV_IMAGE_NAME" . +# docker run -v "$yb_devops_home:/devops" -u "$UID:$(id -g $UID)" "$DOCKER_VENV_IMAGE_NAME" # PEX virtual env build for other deployments. cd "$yb_devops_home/pex" diff --git a/managed/devops/yb_release_manifest.json b/managed/devops/yb_release_manifest.json index 9895f9fee821..904dfb630e2d 100644 --- a/managed/devops/yb_release_manifest.json +++ b/managed/devops/yb_release_manifest.json @@ -7,7 +7,6 @@ "destroy-instance.yml", "python_requirements_frozen.txt", "python3_requirements_frozen.txt", - "python*_modules.tar.gz", "preprovision.yml", "use_custom_ssh_port.yml", "yb-server-ctl.yml",