Skip to content

Commit 8f26d45

Browse files
djmitchebluemarvin
authored andcommitted
Bug 1574661 - update to use new TC deployment (#2086)
* Bug 1574661 - update to use new TC deployment * Use new worker pool names (provisionerId / workerType) * Use new secret names * update links in README
1 parent c5abf5f commit 8f26d45

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.taskcluster.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ tasks:
2525
###############################################################################
2626
- $if: 'tasks_for == "github-pull-request" && event["action"] in ["opened", "edited", "reopened", "synchronize"]'
2727
then:
28-
provisionerId: 'aws-provisioner-v1'
29-
workerType: 'github-worker'
28+
provisionerId: 'proj-firefoxreality'
29+
workerType: 'ci-linux'
3030
deadline: {$fromNow: 1 day}
3131
expires: {$fromNow: 1 year}
3232
payload:
@@ -64,14 +64,14 @@ tasks:
6464
then: "-f ${event.ref[19:]}"
6565
else: "-f master"
6666
in:
67-
provisionerId: 'aws-provisioner-v1'
68-
workerType: 'github-worker'
67+
provisionerId: 'proj-firefoxreality'
68+
workerType: 'ci-linux'
6969
deadline: {$fromNow: 1 day}
7070
expires: {$fromNow: 1 year}
7171
scopes:
72-
- "secrets:get:project/firefoxreality/github-deploy-key"
73-
- "secrets:get:project/firefoxreality/staging-signing-token"
74-
- "secrets:get:project/firefoxreality/symbols-token"
72+
- "secrets:get:project/firefoxreality/fr/github-deploy-key"
73+
- "secrets:get:project/firefoxreality/fr/staging-signing-token"
74+
- "secrets:get:project/firefoxreality/fr/symbols-token"
7575
routes:
7676
7777
payload:
@@ -92,7 +92,7 @@ tasks:
9292
&& . tools/taskcluster/get_third_party.sh
9393
&& cp tools/gradle/taskcluster.properties ./user.properties
9494
&& ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py =all`
95-
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/staging-signing-token -o token -n token
95+
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/fr/staging-signing-token -o token -n token
9696
&& python tools/taskcluster/sign_apk.py -t token ${featureName}
9797
&& python tools/taskcluster/archive_debug_apk.py
9898
&& . tools/taskcluster/upload_symbols.sh
@@ -114,14 +114,14 @@ tasks:
114114
###############################################################################
115115
- $if: 'tasks_for == "github-release" && event["action"] == "published"'
116116
then:
117-
provisionerId: 'aws-provisioner-v1'
118-
workerType: 'github-worker'
117+
provisionerId: 'proj-firefoxreality'
118+
workerType: 'ci-linux'
119119
deadline: {$fromNow: 1 day}
120120
expires: {$fromNow: 1 year}
121121
scopes:
122-
- "secrets:get:project/firefoxreality/github-deploy-key"
123-
- "secrets:get:project/firefoxreality/release-signing-token"
124-
- "secrets:get:project/firefoxreality/symbols-token"
122+
- "secrets:get:project/firefoxreality/fr/github-deploy-key"
123+
- "secrets:get:project/firefoxreality/fr/release-signing-token"
124+
- "secrets:get:project/firefoxreality/fr/symbols-token"
125125
routes:
126126
127127
payload:
@@ -142,7 +142,7 @@ tasks:
142142
&& . tools/taskcluster/get_third_party.sh
143143
&& cp tools/gradle/taskcluster.properties ./user.properties
144144
&& ./gradlew --no-daemon --console=plain clean `python tools/taskcluster/build_targets.py ${event.release.tag_name}`
145-
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/release-signing-token -o token -n token
145+
&& python tools/taskcluster/fetch_secret.py -s project/firefoxreality/fr/release-signing-token -o token -n token
146146
&& python tools/taskcluster/sign_apk.py -t token -r
147147
&& python tools/taskcluster/archive_debug_apk.py
148148
&& . tools/taskcluster/upload_symbols.sh

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ The goal of the Firefox Reality project is to create a full-featured browser exc
44

55
You can find us on Twitter [@MozillaReality](https://twitter.com/mozillareality) and at [[email protected]](mailto:[email protected]).
66

7-
[![Task Status](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/badge.svg)](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest) [Build results](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest)
7+
[![Task Status](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest) [Build results](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest)
88

99
## Download developer APKs
1010

11-
**[Download](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest)** [bleeding-edge](https://github.com/MozillaReality/FirefoxReality/commits/master) developer APKs for Firefox Reality.
11+
**[Download](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest)** [bleeding-edge](https://github.com/MozillaReality/FirefoxReality/commits/master) developer APKs for Firefox Reality.
1212

1313
### Advanced
1414

15-
1. Load [this TaskCluster URL](https://github.taskcluster.net/v1/repository/MozillaReality/FirefoxReality/master/latest).
15+
1. Load [this TaskCluster URL](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaReality/FirefoxReality/master/latest).
1616
2. Click the `Firefox Reality for Android - Build - Master update →` link.
1717
3. Click the `Run Artifacts` tab, and click to download the APK for your platform of choice.
1818

tools/taskcluster/get_third_party.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
mkdir ~/.ssh
33
chmod go-rwx ~/.ssh
44
cp tools/ssh/config ~/.ssh
5-
python tools/taskcluster/fetch_secret.py -s project/firefoxreality/github-deploy-key -o ~/.ssh/deploymentkey_rsa -n key
5+
python tools/taskcluster/fetch_secret.py -s project/firefoxreality/fr/github-deploy-key -o ~/.ssh/deploymentkey_rsa -n key
66
chmod go-rwx ~/.ssh/deploymentkey_rsa
77
git clone [email protected]:MozillaReality/FirefoxReality-android-third-party.git third_party
88
pushd third_party && git checkout -b target-branch `cat ../third_party_hash` && popd

0 commit comments

Comments
 (0)