RD-6984 Use a separate python .tgz for the CLI rpm/deb (#1477)

tehasdf · Łukasz Maksymczuk · web-flow · commit 5ef88b8198cd · 2023-04-20T17:19:17.000+02:00
We've already built this tgz so let's use it...

Co-authored-by: Łukasz Maksymczuk &lt;lukasz@lukasz-maksymczuk.intra.codilime.com&gt;
diff --git a/packaging/cloudify-cli.spec b/packaging/cloudify-cli.spec
@@ -23,7 +23,7 @@ URL:            https://github.com/cloudify-cosmo/cloudify-cli
 Vendor:         Cloudify Platform Ltd.
 Packager:       Cloudify Platform Ltd.
 
-Source0:        https://cloudify-cicd.s3.amazonaws.com/python-build-packages/cfy-python3.11-%{ARCHITECTURE}.tgz
+Source0:        https://cloudify-cicd.s3.amazonaws.com/python-build-packages/cfy-python3.11-%{ARCHITECTURE}-cli.tgz
 
 
 %description
@@ -35,7 +35,7 @@ sudo tar xf %{S:0} -C /
 %build
 
 # Create the venv with the custom Python symlinked in
-/opt/python3.11/bin/python3.11 -m venv %_cli_env
+/opt/cfy/python3.11/bin/python3.11 -m venv %_cli_env
 
 %_cli_env/bin/pip install --upgrade pip
 %_cli_env/bin/pip install -r "${RPM_SOURCE_DIR}/dev-requirements.txt"
diff --git a/packaging/debian/build.sh b/packaging/debian/build.sh
@@ -31,10 +31,10 @@ Description: Cloudify's Command Line Interface
 EOF
 
 # Download and untar our python3.11 package
-curl https://cloudify-cicd.s3.amazonaws.com/python-build-packages/cfy-python3.11-x86_64.tgz -o cfy-python3.11.tgz
+curl https://cloudify-cicd.s3.amazonaws.com/python-build-packages/cfy-python3.11-x86_64-cli.tgz -o cfy-python3.11.tgz
 tar xf cfy-python3.11.tgz -C /
 
-/opt/python3.11/bin/python3.11 -m venv /opt/cfy
+/opt/cfy/python3.11/bin/python3.11 -m venv /opt/cfy
 
 /opt/cfy/bin/pip install --upgrade pip setuptools
 /opt/cfy/bin/pip install -r "${PROJECT_DIR}/dev-requirements.txt"
