Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1471)

Unified Diff: scripts/slave/recipe_modules/blimp/example.expected/Blimp_Client_Engine_Integration_test_pass.json

Issue 2416253003: Add the recipe_modules/blimp for integration bot (Closed)
Patch Set: add script steps in example.py Created 4 years, 2 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
Index: scripts/slave/recipe_modules/blimp/example.expected/Blimp_Client_Engine_Integration_test_pass.json
diff --git a/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json b/scripts/slave/recipe_modules/blimp/example.expected/Blimp_Client_Engine_Integration_test_pass.json
similarity index 90%
rename from scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
rename to scripts/slave/recipe_modules/blimp/example.expected/Blimp_Client_Engine_Integration_test_pass.json
index 71be6c867d566d6bcee9375fc08d8cce0beb5e48..cdb1d2eda8c15458befef78ad8cea245c10e9c69 100644
--- a/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
+++ b/scripts/slave/recipe_modules/blimp/example.expected/Blimp_Client_Engine_Integration_test_pass.json
@@ -192,8 +192,9 @@
"cwd": "[SLAVE_BUILD]/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "GYP_CROSSCOMPILE": "1",
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -234,7 +235,7 @@
"--ninja-path",
"RECIPE_PACKAGE_REPO[depot_tools]/ninja",
"--target",
- "Release",
+ "Debug",
"--src-dir",
"[SLAVE_BUILD]/src",
"--goma-cache-dir",
@@ -254,14 +255,15 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--out-dir",
- "[SLAVE_BUILD]/src/out-linux/Debug",
+ "[SLAVE_BUILD]/src/out-linux",
"--goma-dir",
"[CACHE]/cipd/goma",
"--",
"blimp"
],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "compile",
"~followup_annotations": [
@@ -306,7 +308,7 @@
"--ninja-path",
"RECIPE_PACKAGE_REPO[depot_tools]/ninja",
"--target",
- "Release",
+ "Debug",
"--src-dir",
"[SLAVE_BUILD]/src",
"--goma-cache-dir",
@@ -326,7 +328,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--out-dir",
- "[SLAVE_BUILD]/src/out-android/Debug",
+ "[SLAVE_BUILD]/src/out-android",
"--goma-dir",
"[CACHE]/cipd/goma",
"--",
@@ -334,7 +336,8 @@
"chrome_public_apk"
],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "compile (2)",
"~followup_annotations": [
@@ -343,6 +346,41 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/blimp/tools/client_engine_integration.py",
+ "-l",
+ "[SLAVE_BUILD]/src/out-linux/Debug",
+ "run"
+ ],
+ "name": "[Blimp] Starting engine and forwarder"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/blimp/tools/client_engine_integration.py",
+ "-l",
+ "[SLAVE_BUILD]/src/out-linux/Debug",
+ "load",
+ "--apk-path",
+ "[SLAVE_BUILD]/src/out-android/Debug/apks/ChromePublic.apk"
+ ],
+ "name": "[Blimp] Installing apk and running blimp"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/blimp/tools/client_engine_integration.py",
+ "-l",
+ "[SLAVE_BUILD]/src/out-linux/Debug",
+ "stop"
+ ],
+ "name": "[Blimp] Killing engine and forwarder"
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0

Powered by Google App Engine
This is Rietveld 408576698