From e38279c92198d2ee7bae49963e7baf406cd30fec Mon Sep 17 00:00:00 2001 From: Muthu Chidambaram Date: Tue, 12 Sep 2023 04:04:05 +0000 Subject: [PATCH] [BACKPORT 2.16][PLAT-10228] Fixing docker pymodules creation Summary: Issue with docker image creation was with activating the virtualenv. This diff removes that part from common.sh. Test Plan: Test generated pymodules via docker image on 2.16.7-b56, ensure universe creation succeeds. Reviewers: anijhawan, dshubin, nbhatia Reviewed By: anijhawan Subscribers: aaruj, yugaware Differential Revision: https://phorge.dev.yugabyte.com/D28418 --- managed/devops/bin/common.sh | 2 -- managed/devops/python3_modules_requirements_frozen.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/managed/devops/bin/common.sh b/managed/devops/bin/common.sh index efd487775175..2768b48db306 100644 --- a/managed/devops/bin/common.sh +++ b/managed/devops/bin/common.sh @@ -332,14 +332,12 @@ activate_virtualenv() { } create_pymodules_package() { - activate_virtualenv rm -rf "$YB_PYTHON_MODULES_DIR" mkdir -p "$YB_PYTHON_MODULES_DIR" extra_install_flags="" if [[ $YB_MANAGED_DEVOPS_USE_PYTHON3 == "0" ]]; then extra_install_flags="setuptools<45" fi - run_pip install --upgrade pip > /dev/null # Download the scripts necessary (i.e. ansible). Remove the modules afterwards to avoid # system-specific libraries. log "Downloading package scripts" diff --git a/managed/devops/python3_modules_requirements_frozen.txt b/managed/devops/python3_modules_requirements_frozen.txt index 1267a36a7cbc..fc72e59a447d 100644 --- a/managed/devops/python3_modules_requirements_frozen.txt +++ b/managed/devops/python3_modules_requirements_frozen.txt @@ -61,4 +61,4 @@ s3transfer==0.4.2 six==1.10.0 uritemplate==3.0.1 urllib3==1.26.6 -yb-cassandra-driver==3.13.0.2 \ No newline at end of file +yb-cassandra-driver==3.13.0.2