Skip to content

Commit

Permalink
[BACKPORT 2.16][PLAT-10228] Fixing docker pymodules creation
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mchiddy committed Sep 12, 2023
1 parent caa22a5 commit e38279c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions managed/devops/bin/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion managed/devops/python3_modules_requirements_frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
yb-cassandra-driver==3.13.0.2

0 comments on commit e38279c

Please sign in to comment.