scripts/slave/recipes/chromium.expected/findbugs_failure.json - Issue 303513002: Initial work towards public Android recipes

Unified Diff: scripts/slave/recipes/chromium.expected/findbugs_failure.json

Issue 303513002: Initial work towards public Android recipes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: rebase Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « scripts/slave/recipes/chromium.py ('k') | scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_Builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium.expected/findbugs_failure.json

diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/findbugs_failure.json

similarity index 68%

copy from scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Builder__dbg_.json

copy to scripts/slave/recipes/chromium.expected/findbugs_failure.json

index efd50a944e4f954f736b24930ff1ca99240b3f5c..84521db5f25d21e5ff7b831e9964f36d33523c3b 100644

--- a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_Linux_ChromiumOS_Builder__dbg_.json

+++ b/scripts/slave/recipes/chromium.expected/findbugs_failure.json

@@ -6,13 +6,13 @@

"-u",

"[BUILD]/scripts/slave/bot_update.py",

"--master",

- "chromium.chromiumos",

+ "chromium.linux",

"--builder",

- "Linux ChromiumOS Builder (dbg)",

+ "Android Builder (dbg)",

"--slave",

"TestSlavename",

"--spec",

- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",

+ "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",

"--revision_mapping_file",

"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarm_client\": \"got_swarm_client_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",

"--output_json",

@@ -35,7 +35,7 @@

"[DEPOT_TOOLS]/gclient.py",

"config",

"--spec",

"name": "gclient setup"

@@ -98,7 +98,8 @@

"runhooks"

"env": {

- "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=ChromeOS gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1"

+ "GYP_CROSSCOMPILE": "1",

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1"

"name": "gclient runhooks"

@@ -107,12 +108,12 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",

"/path/to/tmp/json"

"name": "read test spec",

"~followup_annotations": [

- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json@@@",

+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",

"@@@STEP_LOG_LINE@json.output@{}@@@",

"@@@STEP_LOG_END@json.output@@@"

]

@@ -142,13 +143,13 @@

"--goma-dir",

"[BUILD]/goma",

"--",

- "aura_builder"

+ "base_unittests_apk"

"name": "compile",

"seed_steps": [

"compile",

"checkdeps",

- "package build"

+ "check_licenses"

]

{

@@ -167,20 +168,73 @@

{

"cmd": [

+ "[SLAVE_BUILD]/src/android_webview/tools/webview_licenses.py",

+ "scan"

+ ],

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "check_licenses"

+ },

+ {

+ "cmd": [

+ "[SLAVE_BUILD]/src/build/android/findbugs_diff.py"

+ ],

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "findbugs",

+ "~followup_annotations": [

+ "step returned non-zero exit code: 1",

+ "@@@STEP_FAILURE@@@"

+ ]

+ },

+ {

+ "always_run": true,

+ "cmd": [

+ "python",

+ "-u",

+ "\nimport sys\nfrom common import chromium_utils\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n",

+ "*.class",

+ "[SLAVE_BUILD]/src/out"

+ ],

+ "name": "rmwildcard *.class in [SLAVE_BUILD]/src/out",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",

+ "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@",

+ "@@@STEP_LOG_LINE@python.inline@@@@",

+ "@@@STEP_LOG_LINE@python.inline@chromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])@@@",

+ "@@@STEP_LOG_END@python.inline@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "[SLAVE_BUILD]/src/tools/android/findbugs_plugin/test/run_findbugs_plugin_tests.py"

+ ],

+ "env": {

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "findbugs_tests",

+ "skip": true

+ },

+ {

+ "cmd": [

"python",

"-u",

"[BUILD]/scripts/slave/zip_build.py",

"--target",

"Debug",

"--build-url",

- "gs://chromium-chromiumos-archive/chromium.chromiumos/Linux ChromiumOS Builder (dbg)",

+ "gs://chromium-linux-archive/chromium.linux/Android Builder (dbg)",

"--build_revision",

"170242",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux ChromiumOS Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

- "name": "package build"

+ "name": "package build",

+ "skip": true

}

]