Install xz where fuzzfetch is used

MozillaSecurity · Nov 27, 2024 · 49e5801 · 49e5801
1 parent 97327fb
commit 49e5801
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/recipes/linux/fuzzfetch.sh b/recipes/linux/fuzzfetch.sh
@@ -18,7 +18,8 @@ case "${1-install}" in
     sys-embed \
       ca-certificates \
       lbzip2 \
-      python3
+      python3 \
+      xz-utils
     apt-install-auto \
       git \
       pipx

diff --git a/services/gr-css-reports/launch.sh b/services/gr-css-reports/launch.sh
@@ -20,8 +20,6 @@ export {GIT_AUTHOR_NAME,GIT_COMMITTER_NAME}="Taskcluster Automation"
 # Install prefpicker
 retry python3 -m pip install git+https://github.com/MozillaSecurity/prefpicker.git
 
-# Install fuzzfetch
-retry python3 -m pip install git+https://github.com/MozillaSecurity/fuzzfetch.git
 # Fetch build
 retry python3 -m fuzzfetch -a --fuzzing -n nightly
 

diff --git a/services/gr-css-reports/setup.sh b/services/gr-css-reports/setup.sh
@@ -7,6 +7,13 @@ set -e
 set -x
 set -o pipefail
 
+# shellcheck source=recipes/linux/common.sh
+source "${0%/*}/common.sh"
+
+# Install deps
+sys-update
+"${0%/*}/fuzzfetch.sh"
+
 # Cleanup grizzly scripts
 rm /home/worker/launch-grizzly*
 

diff --git a/services/grizzly/setup.sh b/services/grizzly/setup.sh
@@ -52,6 +52,7 @@ packages=(
   ubuntu-restricted-addons
   vulkan-validationlayers
   wget
+  xz-utils
   zip
   zstd
 )

diff --git a/services/nyx/setup.sh b/services/nyx/setup.sh
@@ -49,6 +49,7 @@ pkgs=(
   psmisc
   python3
   xvfb
+  xz-utils
   zstd
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ packages=( @@
       ubuntu-restricted-addons
       vulkan-validationlayers
       wget
+      xz-utils
       zip
       zstd
     )
@@ Expand Down @@