Skip to content

Commit

Permalink
ci: use taskgraph 12.1.0 (#3267)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcristau authored Dec 12, 2024
1 parent ed65b5d commit 15c975d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 240 deletions.
5 changes: 2 additions & 3 deletions .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ tasks:
BALROG_HEAD_REF: '${head_branch}'
BALROG_HEAD_REV: '${head_sha}'
BALROG_REPOSITORY_TYPE: git
BALROG_PIP_REQUIREMENTS: taskcluster/requirements.txt
REPOSITORIES: {$json: {balrog: "Balrog"}}
- $if: 'tasks_for in ["github-pull-request"]'
then:
Expand All @@ -120,7 +119,7 @@ tasks:
chainOfTrust: true
# Note: This task is built server side without the context or tooling that
# exist in tree so we must hard code the hash
image: mozillareleases/taskgraph:decision-c4ac262880970ca484105929e02dd12f00214d5f2603ab6ce4c0d17de5cd0280@sha256:2dd667994aa13fccdcdcede85c570a5eb4a5247e42875a9e95a135ef774ee469
image: mozillareleases/taskgraph:decision-v12.1.0@sha256:756d6edd4c60e1c58132a667273e3cb6113bde3d7a4a3f7b326b375caf53eb81
maxRunTime: 1800

command:
Expand All @@ -137,7 +136,7 @@ tasks:
else: ''
in:
ln -s /builds/worker/artifacts artifacts &&
~/.local/bin/taskgraph decision
taskgraph decision
--pushlog-id='0'
--pushdate='0'
--project='${project}'
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/docker/node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
FROM node:16

# Add worker user
RUN mkdir /builds && \
RUN mkdir -p /builds && \
groupadd -g 1000 -o worker && \
useradd -d /builds/worker -s /bin/bash -m worker -g 1000 -o -u 1000 && \
mkdir /builds/worker/artifacts && \
chown worker:worker /builds/worker/artifacts
chown worker:worker /builds/worker /builds/worker/artifacts

# the push-js task uses aws cli to sync to s3
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/docker/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ ARG PYTHON_VERSION
FROM python:$PYTHON_VERSION

# Add worker user
RUN mkdir /builds && \
RUN mkdir -p /builds && \
groupadd -g 1000 -o worker && \
useradd -d /builds/worker -s /bin/bash -m worker -g 1000 -o -u 1000 && \
mkdir /builds/worker/artifacts && \
chown worker:worker /builds/worker/artifacts
chown worker:worker /builds/worker /builds/worker/artifacts

RUN pip install tox

Expand Down
4 changes: 2 additions & 2 deletions taskcluster/kinds/push-image/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ tasks:
balrog-backend:
description: "Push balrog backend docker image"
dependencies:
image: build-docker-image-balrog-backend
image: docker-image-balrog-backend
worker:
env:
DOCKER_REPO: docker.io/mozilla/balrog
APP: backend
balrog-agent:
description: "Push balrogagent docker image"
dependencies:
image: build-docker-image-balrog-agent
image: docker-image-balrog-agent
worker:
env:
DOCKER_REPO: docker.io/mozilla/balrogagent
Expand Down
1 change: 0 additions & 1 deletion taskcluster/requirements.in

This file was deleted.

230 changes: 0 additions & 230 deletions taskcluster/requirements.txt

This file was deleted.

0 comments on commit 15c975d

Please sign in to comment.