Unverified Commit cb7791d7 authored by Johan Lorenzo's avatar Johan Lorenzo Committed by GitHub
Browse files

Make nimbledroid not depend on a real token on staging releases (#7570)

parent cb18049c
...@@ -38,5 +38,9 @@ token_file = sys.argv[2] ...@@ -38,5 +38,9 @@ token_file = sys.argv[2]
with open(token_file) as f: with open(token_file) as f:
key = f.read() key = f.read()
if key.rstrip() == '--':
print('Nimbledroid key "--" detected. Not uploading anything to the service.')
sys.exit(0)
with open(apk_path) as apk_file: with open(apk_path) as apk_file:
uploadApk({'apk': apk_file}, key) uploadApk({'apk': apk_file}, key)
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
loader: taskgraph.loader.transform:loader loader: taskgraph.loader.transform:loader
transforms: transforms:
- fenix_taskgraph.transforms.nimbledroid:transforms
- taskgraph.transforms.job:transforms - taskgraph.transforms.job:transforms
- taskgraph.transforms.task:transforms - taskgraph.transforms.task:transforms
...@@ -18,9 +19,17 @@ job-defaults: ...@@ -18,9 +19,17 @@ job-defaults:
using: run-commands using: run-commands
use-caches: false use-caches: false
secrets: secrets:
by-level:
'3':
- name: project/mobile/fenix/nimbledroid - name: project/mobile/fenix/nimbledroid
key: api_key key: api_key
path: .nimbledroid_token path: .nimbledroid_token
default: []
pre-commands:
by-level:
'3': []
default:
- [echo, '--', '>', .nimbledroid_token]
run-on-tasks-for: [] run-on-tasks-for: []
treeherder: treeherder:
kind: test kind: test
...@@ -41,7 +50,6 @@ jobs: ...@@ -41,7 +50,6 @@ jobs:
commands: commands:
- [wget, {artifact-reference: '<signing/public/build/armeabi-v7a/geckoNightly/target.apk>'}, '-O', target.apk] - [wget, {artifact-reference: '<signing/public/build/armeabi-v7a/geckoNightly/target.apk>'}, '-O', target.apk]
- [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token] - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token]
treeherder: treeherder:
symbol: nightly(nimbledroid) symbol: nightly(nimbledroid)
...@@ -68,4 +76,3 @@ jobs: ...@@ -68,4 +76,3 @@ jobs:
- [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token] - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token]
treeherder: treeherder:
symbol: beta(nimbledroid) symbol: beta(nimbledroid)
\ No newline at end of file
...@@ -32,6 +32,7 @@ gradlew_schema = Schema({ ...@@ -32,6 +32,7 @@ gradlew_schema = Schema({
run_commands_schema = Schema({ run_commands_schema = Schema({
Required("using"): "run-commands", Required("using"): "run-commands",
Optional("pre-commands"): [[text_type]],
Required("commands"): [[taskref_or_string]], Required("commands"): [[taskref_or_string]],
Required("workdir"): text_type, Required("workdir"): text_type,
Optional("use-caches"): bool, Optional("use-caches"): bool,
...@@ -42,7 +43,8 @@ run_commands_schema = Schema({ ...@@ -42,7 +43,8 @@ run_commands_schema = Schema({
@run_job_using("docker-worker", "run-commands", schema=run_commands_schema) @run_job_using("docker-worker", "run-commands", schema=run_commands_schema)
def configure_run_commands_schema(config, job, taskdesc): def configure_run_commands_schema(config, job, taskdesc):
run = job["run"] run = job["run"]
pre_commands = [ pre_commands = run.pop("pre-commands", [])
pre_commands += [
_generate_secret_command(secret) for secret in run.get("secrets", []) _generate_secret_command(secret) for secret in run.get("secrets", [])
] ]
all_commands = pre_commands + run.pop("commands", []) all_commands = pre_commands + run.pop("commands", [])
......
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
"""
Apply some defaults and minor modifications to the jobs defined in the nimbledroid
kind.
"""
from __future__ import absolute_import, print_function, unicode_literals
from taskgraph.transforms.base import TransformSequence
from taskgraph.util.schema import resolve_keyed_by
transforms = TransformSequence()
@transforms.add
def resolve_keys(config, tasks):
for task in tasks:
for key in ("run.secrets", "run.pre-commands"):
resolve_keyed_by(
task,
key,
item_name=task["name"],
level=config.params["level"]
)
yield task
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment