From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 19 Apr 2022 15:55:59 +0000 (-0700)
Subject: Fix: Remove "--python" flag from venv activation
X-Git-Tag: v0.76.1^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F40%2F70040%2F3;p=releng%2Fglobal-jjb.git

Fix: Remove "--python" flag from venv activation

Remove "--python" flag from lf-activate-venv call in
capture-instance-metadata. This forces the system to use Python 2,
which is not available on newer systems, and is causing failures.

Change-Id: I456a1463885b6269b555edbd587c9cfc039c78da
Issue: RELENG-4192
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml b/releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml
new file mode 100644
index 00000000..e5dca742
--- /dev/null
+++ b/releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Remove "--python" flag from lf-activate-venv call in capture-instance-metadata.
+    This forces the system to use Python 2, which is not available on newer
+    systems, and is causing failures.
diff --git a/shell/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh
index 0648d1dd..57a4e8d1 100644
--- a/shell/capture-instance-metadata.sh
+++ b/shell/capture-instance-metadata.sh
@@ -14,7 +14,7 @@ echo "---> capture-instance-metadata.sh"
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv --python python3.8 lftools
+lf-activate-venv python3.8 lftools
 
 # detect if we're in EC2
 if [ -n "${NOMAD_DC}" ]; then