tor-browser

commit 2f8accd2ead8db716892cd663eafa0b9e4aebebd
parent 8a46a5f6b1b0bd1f1f7e4d428877ea12b233e9f5
Author: Julien Cristau <jcristau@mozilla.com>
Date:   Fri, 14 Nov 2025 14:35:26 +0000

Bug 1999216 - run linux condprof directly on the ubuntu2404-test docker image. r=sparky

The packages it installs are part of the parent image already.

Differential Revision: https://phabricator.services.mozilla.com/D271948

Diffstat:
D
taskcluster/docker/condprof/Dockerfile
 | 
15
---------------
M
taskcluster/kinds/condprof/kind.yml
 | 
2
+-
M
taskcluster/kinds/docker-image/kind.yml
 | 
3
---

3 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/taskcluster/docker/condprof/Dockerfile b/taskcluster/docker/condprof/Dockerfile
@@ -1,15 +0,0 @@
-FROM $DOCKER_IMAGE_PARENT
-MAINTAINER    Gregory Mierzwinski <gmierzwinski@mozilla.com>
-
-VOLUME /builds/worker/.cache
-VOLUME /builds/worker/checkouts
-VOLUME /builds/worker/tooltool-cache
-VOLUME /builds/worker/workspace
-
-RUN apt-get -y update && \
-    apt-get install -y python3 \
-      python3-venv \
-      python3-dev
-
-CMD ["/bin/bash", "--login"]
-
diff --git a/taskcluster/kinds/condprof/kind.yml b/taskcluster/kinds/condprof/kind.yml
@@ -97,7 +97,7 @@ tasks:
                 --scenario ${SCENARIO}
                 ../../archive
         worker:
-            docker-image: {in-tree: condprof}
+            docker-image: {in-tree: ubuntu2404-test}
             artifacts:
                 - name: public/condprof
                   path: /builds/worker/archive
diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml
@@ -345,9 +345,6 @@ tasks:
     webrender:
         symbol: I(webrender)
         parent: debian12-base
-    condprof:
-        symbol: I(condprof)
-        parent: ubuntu2404-test
     sentry:
         symbol: I(sentry)
         parent: debian12-base