Skip to content

Commit 1bfe1b2

Browse files
committed
Reduce taskcluster ubuntu builds to just the latest dist
1 parent b30406b commit 1bfe1b2

2 files changed

Lines changed: 8 additions & 38 deletions

File tree

taskcluster/kinds/build/linux.yml

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,14 @@ task-defaults:
2525
use-caches: [checkout, pip]
2626
command: /builds/worker/builder.sh
2727

28-
linux/jammy:
29-
description: "Linux Build (Ubuntu/Jammy)"
28+
linux/ubuntu:
29+
description: "Linux Build (Ubuntu)"
3030
treeherder:
31-
platform: linux/jammy
31+
platform: linux/ubuntu
3232
worker:
33-
docker-image: {in-tree: linux-build-jammy}
33+
docker-image: {in-tree: linux-build-ubuntu}
3434
add-index-routes:
35-
name: linux-jammy
36-
type: build
37-
38-
linux/noble:
39-
description: "Linux Build (Ubuntu/Noble)"
40-
treeherder:
41-
platform: linux/noble
42-
worker:
43-
docker-image: {in-tree: linux-build-noble}
44-
add-index-routes:
45-
name: linux-noble
46-
type: build
47-
48-
linux/resolute:
49-
description: "Linux Build (Ubuntu/Resolute)"
50-
treeherder:
51-
platform: linux/resolute
52-
worker:
53-
docker-image: {in-tree: linux-build-resolute}
54-
add-index-routes:
55-
name: linux-resolute
35+
name: linux-ubuntu
5636
type: build
5737

5838
linux/fedora:

taskcluster/kinds/docker-image/kind.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,11 @@ tasks:
4141
parent: base
4242
symbol: I(linux-rpm-build)
4343
definition: linux-rpm-build
44-
linux-build-jammy:
45-
symbol: I(linux-jammy)
44+
linux-build-ubuntu:
45+
symbol: I(linux-ubuntu)
4646
definition: linux-dpkg-build
4747
args:
48-
DOCKER_BASE_IMAGE: '{dockerhub:ubuntu:jammy}'
49-
linux-build-noble:
50-
symbol: I(linux-noble)
51-
definition: linux-dpkg-build
52-
args:
53-
DOCKER_BASE_IMAGE: '{dockerhub:ubuntu:noble}'
54-
linux-build-resolute:
55-
symbol: I(linux-resolute)
56-
definition: linux-dpkg-build
57-
args:
58-
DOCKER_BASE_IMAGE: '{dockerhub:ubuntu:resolute}'
48+
DOCKER_BASE_IMAGE: '{dockerhub:ubuntu:latest}'
5949
linux-build-fedora:
6050
symbol: I(linux-fedora)
6151
definition: linux-rpm-build

0 commit comments

Comments
 (0)