Skip to content

Commit 15c975d

Browse files
authored
ci: use taskgraph 12.1.0 (#3267)
1 parent ed65b5d commit 15c975d

File tree

6 files changed

+8
-240
lines changed

6 files changed

+8
-240
lines changed

.taskcluster.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ tasks:
110110
BALROG_HEAD_REF: '${head_branch}'
111111
BALROG_HEAD_REV: '${head_sha}'
112112
BALROG_REPOSITORY_TYPE: git
113-
BALROG_PIP_REQUIREMENTS: taskcluster/requirements.txt
114113
REPOSITORIES: {$json: {balrog: "Balrog"}}
115114
- $if: 'tasks_for in ["github-pull-request"]'
116115
then:
@@ -120,7 +119,7 @@ tasks:
120119
chainOfTrust: true
121120
# Note: This task is built server side without the context or tooling that
122121
# exist in tree so we must hard code the hash
123-
image: mozillareleases/taskgraph:decision-c4ac262880970ca484105929e02dd12f00214d5f2603ab6ce4c0d17de5cd0280@sha256:2dd667994aa13fccdcdcede85c570a5eb4a5247e42875a9e95a135ef774ee469
122+
image: mozillareleases/taskgraph:decision-v12.1.0@sha256:756d6edd4c60e1c58132a667273e3cb6113bde3d7a4a3f7b326b375caf53eb81
124123
maxRunTime: 1800
125124

126125
command:
@@ -137,7 +136,7 @@ tasks:
137136
else: ''
138137
in:
139138
ln -s /builds/worker/artifacts artifacts &&
140-
~/.local/bin/taskgraph decision
139+
taskgraph decision
141140
--pushlog-id='0'
142141
--pushdate='0'
143142
--project='${project}'

taskcluster/docker/node/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
FROM node:16
66

77
# Add worker user
8-
RUN mkdir /builds && \
8+
RUN mkdir -p /builds && \
99
groupadd -g 1000 -o worker && \
1010
useradd -d /builds/worker -s /bin/bash -m worker -g 1000 -o -u 1000 && \
1111
mkdir /builds/worker/artifacts && \
12-
chown worker:worker /builds/worker/artifacts
12+
chown worker:worker /builds/worker /builds/worker/artifacts
1313

1414
# the push-js task uses aws cli to sync to s3
1515
ENV DEBIAN_FRONTEND=noninteractive

taskcluster/docker/python/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ ARG PYTHON_VERSION
66
FROM python:$PYTHON_VERSION
77

88
# Add worker user
9-
RUN mkdir /builds && \
9+
RUN mkdir -p /builds && \
1010
groupadd -g 1000 -o worker && \
1111
useradd -d /builds/worker -s /bin/bash -m worker -g 1000 -o -u 1000 && \
1212
mkdir /builds/worker/artifacts && \
13-
chown worker:worker /builds/worker/artifacts
13+
chown worker:worker /builds/worker /builds/worker/artifacts
1414

1515
RUN pip install tox
1616

taskcluster/kinds/push-image/kind.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ tasks:
3939
balrog-backend:
4040
description: "Push balrog backend docker image"
4141
dependencies:
42-
image: build-docker-image-balrog-backend
42+
image: docker-image-balrog-backend
4343
worker:
4444
env:
4545
DOCKER_REPO: docker.io/mozilla/balrog
4646
APP: backend
4747
balrog-agent:
4848
description: "Push balrogagent docker image"
4949
dependencies:
50-
image: build-docker-image-balrog-agent
50+
image: docker-image-balrog-agent
5151
worker:
5252
env:
5353
DOCKER_REPO: docker.io/mozilla/balrogagent

taskcluster/requirements.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

taskcluster/requirements.txt

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)