Install xz where fuzzfetch is used

MozillaSecurity · Nov 27, 2024 · 05a8717 · 05a8717
1 parent 97327fb
commit 05a8717
Show file tree

Hide file tree

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

diff --git a/services/bugmon-win/setup.sh b/services/bugmon-win/setup.sh
@@ -13,6 +13,7 @@ retry pacman --noconfirm -S \
   patch \
   psmisc \
   tar \
+  xz \
   zstd
 pacman --noconfirm -Scc
 killall -TERM gpg-agent || true

diff --git a/services/coverage-revision/Dockerfile b/services/coverage-revision/Dockerfile
@@ -11,7 +11,7 @@ COPY base/linux/etc/pip.conf /etc/pip.conf
 WORKDIR /root
 
 RUN retry () { i=0; while [ $i -lt 9 ]; do if "$@"; then return; else sleep 30; fi; i="$((i+1))"; done; "$@"; } \
-    && retry apk add --no-cache bash curl \
+    && retry apk add --no-cache bash curl xz \
     && retry pip install --disable-pip-version-check --no-cache-dir --progress-bar off fuzzfetch
 
 COPY recipes/linux/common.sh services/coverage-revision/launch.sh /root/

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-reduce-monitor/Dockerfile b/services/grizzly-reduce-monitor/Dockerfile
@@ -20,6 +20,7 @@ RUN retry () { i=0; while [ $i -lt 9 ]; do if "$@"; then return; else sleep 30;
         py3-six \
         py3-wheel \
         py3-yarl \
+        xz \
     && find /usr/lib/python3.* -type f -name EXTERNALLY-MANAGED -delete \
     && pip freeze > /src/os_constraints.txt \
     && retry pip install --constraint /src/os_constraints.txt --disable-pip-version-check --no-cache-dir --progress-bar off -e /src \

diff --git a/services/grizzly-win/setup.sh b/services/grizzly-win/setup.sh
@@ -14,6 +14,7 @@ retry pacman --noconfirm -S \
   psmisc \
   subversion \
   tar \
+  xz \
   zstd
 pacman --noconfirm -Scc
 killall -TERM gpg-agent || true

diff --git a/services/grizzly/setup.sh b/services/grizzly/setup.sh
@@ -52,6 +52,7 @@ packages=(
   ubuntu-restricted-addons
   vulkan-validationlayers
   wget
+  xz
   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 / @@ -13,6 +13,7 @@ retry pacman --noconfirm -S \ @@
       patch \
       psmisc \
       tar \
+      xz \
       zstd
     pacman --noconfirm -Scc
     killall -TERM gpg-agent || true
@@ Expand Down @@