diff --git a/automation/taskcluster/upload_apk_nimbledroid.py b/automation/taskcluster/upload_apk_nimbledroid.py deleted file mode 100644 index adea302f5..000000000 --- a/automation/taskcluster/upload_apk_nimbledroid.py +++ /dev/null @@ -1,46 +0,0 @@ -# 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/. - -""" -This script talks to the taskcluster secrets service to obtain the -Nimbledroid account key and upload Klar and Focus apk to Nimbledroid for perf analysis. -""" - -import requests -import json -import urllib2 -import os -import sys - -url = "https://nimbledroid.com/api/v2/apks" - -def uploadApk(apk,key): - headers = {"Accept":"*/*"} - payload = {'auto_scenarios':'false', 'device_config': 'android5,android7'} - response = requests.post(url, auth=(key, ''), headers=headers, files=apk, data=payload) - - if response.status_code != 201: - print('Status:', response.status_code, 'Headers:', response.headers, 'Error Response:',response.json()) - exit(1) - - # Print Response Details - print 'Response Status Code:', response.status_code - - print '' - print('Reponse Payload:') - print json.dumps(response.json(), indent=4) - - -apk_path = sys.argv[1] -token_file = sys.argv[2] - -with open(token_file) as f: - key = f.read() - -if key.rstrip() == "faketoken": - print('Nimbledroid key "faketoken" detected. Not uploading anything to the service.') - sys.exit(0) - -with open(apk_path) as apk_file: - uploadApk({'apk': apk_file}, key) diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index 3211bb17d..9be32ec33 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/taskcluster/ci/docker-image/kind.yml @@ -19,9 +19,6 @@ jobs: bump: parent: base symbol: I(bump) - nimbledroid: - parent: base - symbol: I(nimbledroid) ui-tests: parent: base symbol: I(ui-tests) diff --git a/taskcluster/ci/nimbledroid/kind.yml b/taskcluster/ci/nimbledroid/kind.yml deleted file mode 100644 index 8d18ca3b8..000000000 --- a/taskcluster/ci/nimbledroid/kind.yml +++ /dev/null @@ -1,79 +0,0 @@ -# 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/. ---- -loader: taskgraph.loader.transform:loader - -transforms: - - fenix_taskgraph.transforms.secrets:transforms - - taskgraph.transforms.job:transforms - - taskgraph.transforms.task:transforms - -kind-dependencies: - - signing - - -job-defaults: - description: Upload APKs to Nimbledroid for performance measurement and tracking - run: - using: run-commands - use-caches: false - secrets: - by-level: - '3': - - name: project/mobile/fenix/nimbledroid - key: api_key - path: .nimbledroid_token - default: [] - dummy-secrets: - by-level: - '3': [] - default: - - content: "faketoken" - path: .nimbledroid_token - run-on-tasks-for: [] - treeherder: - kind: test - platform: android-all/opt - tier: 2 - worker: - docker-image: {in-tree: nimbledroid} - max-run-time: 600 - worker-type: b-android - -jobs: - nightly: - attributes: - nightly: true - dependencies: - signing: signing-nightly - run: - commands: - - [wget, {artifact-reference: ''}, '-O', target.apk] - - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token] - treeherder: - symbol: nightly(nimbledroid) - - production: - attributes: - release-type: production - dependencies: - signing: signing-production - run: - commands: - - [wget, {artifact-reference: ''}, '-O', target.apk] - - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token] - treeherder: - symbol: production(nimbledroid) - - beta: - attributes: - release-type: beta - dependencies: - signing: signing-beta - run: - commands: - - [wget, {artifact-reference: ''}, '-O', target.apk] - - [python, automation/taskcluster/upload_apk_nimbledroid.py, target.apk, .nimbledroid_token] - treeherder: - symbol: beta(nimbledroid) diff --git a/taskcluster/docker/nimbledroid/Dockerfile b/taskcluster/docker/nimbledroid/Dockerfile deleted file mode 100644 index 61588d849..000000000 --- a/taskcluster/docker/nimbledroid/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# %ARG DOCKER_IMAGE_PARENT -FROM $DOCKER_IMAGE_PARENT - -MAINTAINER Kate Glazko - -RUN pip install requests