Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit a39f5fe

Browse files
committed
chore: Update taskgraph code
1 parent db4d1b0 commit a39f5fe

File tree

15 files changed

+11
-677
lines changed

15 files changed

+11
-677
lines changed

.taskcluster.yml

+11-19
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ policy:
55
pullRequests: collaborators
66
tasks:
77
- $let:
8+
# XXX Set to `true` for private repos
89
privateRepo: false
10+
# XXX Use
11+
# `system` for system add-on,
12+
# `privileged` for AMO or self-hosted privileged add-on,
13+
# `mozillaonline-privileged` for Mozilla China add-on,
14+
# `normandy-privileged` for normandy add-on
15+
# to enable siging on push/PR.
916
xpiSigningType: "privileged"
1017
# The below doesn't need changing on initial repo setup
11-
taskgraph:
12-
branch: taskgraph
13-
revision: 7dde9ce7740068d7b73218976343a28fc99be847
1418
template:
1519
repo: https://github.com/mozilla-extensions/xpi-template
16-
branch: master
20+
branch: main
1721
trustDomain: xpi
1822
in:
1923
$if: 'tasks_for in ["github-pull-request", "github-push", "action", "cron"]'
@@ -137,8 +141,6 @@ tasks:
137141
then:
138142
source: '${repoUrl}/raw/${head_sha}/.taskcluster.yml'
139143
else:
140-
# XXX revisit after https://github.com/taskcluster/taskcluster/pull/2812
141-
# is deployed to the firefoxci cluster.
142144
source: 'ssh://github.com/${repoUrl[15:-4]}/raw/${head_sha}/.taskcluster.yml'
143145
- $if: 'tasks_for in ["github-push", "github-pull-request"]'
144146
then:
@@ -174,7 +176,6 @@ tasks:
174176
- "index.${trustDomain}.v2.${project}.revision.${head_sha}.taskgraph.decision"
175177
else: []
176178
scopes:
177-
# `https://` is 8 characters so, ${repoUrl[8:]} is the repository without the protocol.
178179
$if: 'tasks_for == "github-push"'
179180
then:
180181
$let:
@@ -222,13 +223,9 @@ tasks:
222223
TEMPLATE_HEAD_REPOSITORY: '${template.repo}'
223224
TEMPLATE_HEAD_REV: '${template.branch}'
224225
TEMPLATE_HEAD_REF: '${template.branch}'
226+
TEMPLATE_PIP_REQUIREMENTS: taskcluster/requirements.txt
225227
TEMPLATE_REPOSITORY_TYPE: git
226-
TASKGRAPH_BASE_REPOSITORY: https://hg.mozilla.org/ci/taskgraph
227-
TASKGRAPH_HEAD_REPOSITORY: https://hg.mozilla.org/ci/${taskgraph.branch}
228-
TASKGRAPH_HEAD_REV: '${taskgraph.revision}'
229-
TASKGRAPH_REPOSITORY_TYPE: hg
230-
REPOSITORIES: {$json: {xpi: "XPI Manifest", taskgraph: "Taskgraph", template: "XPI Template"}}
231-
HG_STORE_PATH: /builds/worker/checkouts/hg-store
228+
REPOSITORIES: {$json: {xpi: "XPI Manifest", template: "XPI Template"}}
232229
- $if: 'privateRepo'
233230
then:
234231
XPI_SSH_SECRET_NAME: project/xpi/xpi-github-clone-ssh
@@ -246,16 +243,13 @@ tasks:
246243
chainOfTrust: true
247244
# Note: This task is built server side without the context or tooling that
248245
# exist in tree so we must hard code the hash
249-
image:
250-
mozillareleases/taskgraph:decision-d9fab4448ee5e00b0a29825c3f0609af957279daf102547d715414782710ef06@sha256:79eb469838621168a6364476b96850fc9f2d353686195c010ad078fdcf29568e
251-
246+
image: mozillareleases/taskgraph:decision-f19bfa3ae9dbc19190149445bfc38ad966b713336e44342c7643b3f7f1e0b023@sha256:ddcc7348db272885e8ea32825f698bfafa4727401099531cd8239d3d458b39aa
252247
maxRunTime: 1800
253248

254249
command:
255250
- /usr/local/bin/run-task
256251
- '--xpi-checkout=/builds/worker/checkouts/src'
257252
- '--template-checkout=/builds/worker/checkouts/template'
258-
- '--taskgraph-checkout=/builds/worker/checkouts/taskgraph'
259253
- '--task-cwd=/builds/worker/checkouts/src'
260254
- '--'
261255
- bash
@@ -265,14 +259,12 @@ tasks:
265259
in:
266260
$if: 'tasks_for == "action"'
267261
then: >
268-
PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
269262
cd /builds/worker/checkouts/src &&
270263
rm -rf taskcluster &&
271264
ln -s /builds/worker/checkouts/template/taskcluster taskcluster &&
272265
ln -s /builds/worker/artifacts artifacts &&
273266
~/.local/bin/taskgraph action-callback
274267
else: >
275-
PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
276268
rm -rf taskcluster &&
277269
ln -s /builds/worker/checkouts/template/taskcluster taskcluster &&
278270
ln -s /builds/worker/artifacts artifacts &&

taskcluster/ci/build/kind.yml

-36
This file was deleted.

taskcluster/ci/config.yml

-34
This file was deleted.

taskcluster/ci/dep-signing/kind.yml

-21
This file was deleted.

taskcluster/ci/pr/kind.yml

-19
This file was deleted.

taskcluster/ci/test/kind.yml

-35
This file was deleted.

taskcluster/xpi_taskgraph/__init__.py

-28
This file was deleted.

taskcluster/xpi_taskgraph/build.py

-54
This file was deleted.

0 commit comments

Comments
 (0)