Merge pull request #157 from nicolasbock/pipx

Use `pipx` on Noble
canonical · May 30, 2024 · 5a34474 · 5a34474
2 parents f818885 + b659e4e
commit 5a34474
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/athena-processor.yaml b/athena-processor.yaml
@@ -33,9 +33,11 @@ processor:
               exit-codes: 0 2 127 126
               run: |
                 #!/bin/bash
-                pip3 install hotsos --upgrade &>/dev/null
+                set -e -u
+                pipx install hotsos &>/dev/null
+                pipx upgrade hotsos &>/dev/null
                 tar -xf {{filepath}} -C {{basedir}} &>/dev/null
-                hotsos --save --output-path hotsos-out --all-logs {{basedir}}/$(basename {{filepath}} .tar.xz)/ &>/dev/null
+                ~/.local/bin/hotsos --save --output-path hotsos-out --all-logs {{basedir}}/$(basename {{filepath}} .tar.xz)/ &>/dev/null
                 if [ -s hotsos-out/*/summary/full/yaml/hotsos-summary.all.yaml ]; then
                   cat hotsos-out/*/summary/full/yaml/hotsos-summary.all.yaml
                 else
@@ -47,9 +49,11 @@ processor:
               exit-codes: 0 2 127 126
               run: |
                 #!/bin/bash
-                pip3 install hotsos --upgrade &>/dev/null
+                set -e -u
+                pipx install hotsos &>/dev/null
+                pipx upgrade hotsos &>/dev/null
                 tar -xf {{filepath}} -C {{basedir}} &>/dev/null
-                hotsos --short --save --output-path hotsos-out --all-logs {{basedir}}/$(basename {{filepath}} .tar.xz)/ &>/dev/null
+                ~/.local/bin/hotsos --short --save --output-path hotsos-out --all-logs {{basedir}}/$(basename {{filepath}} .tar.xz)/ &>/dev/null
                 if [ -s hotsos-out/*/summary/short/yaml/hotsos-summary.all.yaml ]; then
                   cat hotsos-out/*/summary/short/yaml/hotsos-summary.all.yaml
                 else

diff --git a/cmd/processor/Dockerfile b/cmd/processor/Dockerfile
@@ -12,8 +12,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends
     git \
     jq \
     patool \
+    pipx \
     python3 \
-    python3-pip \
     python3-simplejson \
     python3-yaml \
     xz-utils