Issue 761343003: Add recipe support for merged chromium-blink repo FYI bots - Code Review

Chromium Code Reviews

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

(413)

My Issues | Starred Open | Closed | All

Issue 761343003: Add recipe support for merged chromium-blink repo FYI bots (Closed)

Created:
6 years ago by Paweł Hajdan Jr.

Modified:
6 years ago

Reviewers:
jochen (gone - plz use gerrit)

CC:
chromium-reviews, cmp-cc_chromium.org, kjellander-cc_chromium.org, pgervais+watch_chromium.org, stip+watch_chromium.org

Base URL:
https://chromium.googlesource.com/chromium/tools/build.git@master

Project:
tools

Visibility:
Public.

More Reviews

Description

Add recipe support for merged chromium-blink repo FYI bots BUG=431463 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=293152

Patch Set 1 #

Created: 6 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+96 lines, -66 lines)			Patch
	M	scripts/slave/recipe_modules/chromium/chromium_fyi.py	View		1 chunk	+26 lines, -0 lines	0 comments	Download
	M	scripts/slave/recipe_modules/chromium/steps.py	View		3 chunks	+13 lines, -9 lines	0 comments	Download
	M	scripts/slave/recipe_modules/chromium_tests/api.py	View		1 chunk	+4 lines, -0 lines	0 comments	Download
	M	scripts/slave/recipe_modules/gclient/config.py	View		1 chunk	+5 lines, -0 lines	0 comments	Download
	M	scripts/slave/recipes/blink_downstream.py	View		2 chunks	+3 lines, -3 lines	0 comments	Download
	M	scripts/slave/recipes/blink_trybot.py	View		4 chunks	+5 lines, -5 lines	0 comments	Download
	A +	scripts/slave/recipes/chromium.expected/full_chromium_fyi_ChromiumPractice.json	View		5 chunks	+9 lines, -10 lines	0 comments	Download
	A +	scripts/slave/recipes/chromium.expected/full_chromium_fyi_ChromiumPracticeTester.json	View		5 chunks	+31 lines, -39 lines	0 comments	Download

Messages

Total messages: 16 (7 generated)

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/761343003/1

6 years ago (2014-11-28 16:22:48 UTC) #5

commit-bot: I haz the power

Failed to apply patch for build/scripts/slave/recipes/blink_trybot.py: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years ago (2014-11-28 16:22:56 UTC) #7

Failed to apply patch for build/scripts/slave/recipes/blink_trybot.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipes/blink_trybot.py
  Hunk #1 FAILED at 350.
  Hunk #2 succeeded at 404 (offset 3 lines).
  Hunk #3 succeeded at 489 (offset 3 lines).
  Hunk #4 FAILED at 497.
  2 out of 4 hunks FAILED -- saving rejects to file
build/scripts/slave/recipes/blink_trybot.py.rej

Patch:       build/scripts/slave/recipes/blink_trybot.py
Index: scripts/slave/recipes/blink_trybot.py
diff --git build/scripts/slave/recipes/blink_trybot.py
build/scripts/slave/recipes/blink_trybot.py
index
7af09db728ebb1ab3d024d0d62a73eb59262a3d4..aca2a0fb04cc5d3adad01cee1add902fce1a3efd
100644
--- a/build/scripts/slave/recipes/blink_trybot.py
+++ b/build/scripts/slave/recipes/blink_trybot.py
@@ -350,7 +350,7 @@ def GenSteps(api):
     api.chromium.compile()
     api.isolate.isolate_tests(api.chromium.output_dir)
 
-  tests = [api.chromium.steps.BlinkTest(api)]
+  tests = [api.chromium.steps.BlinkTest()]
 
   # TODO(sergiyb): Flag enable_gpu_tests is used to enable GPU tests. This
   # is however a temporary measure to enable them in GenTests, but not in
@@ -401,10 +401,10 @@ def GenTests(api):
         for pass_first in (True, False):
           test = (
             api.test(test_name + ('_pass' if pass_first else '_fail')) +
-            api.step_data(with_patch, canned_test(passing=pass_first))
+            api.override_step_data(with_patch, canned_test(passing=pass_first))
           )
           if not pass_first:
-            test += api.step_data(
+            test += api.override_step_data(
                 without_patch, canned_test(passing=False, minimal=True))
           tests.append(test)
 
@@ -486,7 +486,7 @@ def GenTests(api):
     api.test('non_cq_tryjob') +
     properties('tryserver.blink', 'win_blink_rel',
                requester='someone@chromium.org') +
-    api.step_data(with_patch, canned_test(passing=True))
+    api.override_step_data(with_patch, canned_test(passing=True))
   )
 
   yield (
@@ -497,7 +497,7 @@ def GenTests(api):
     # be removed.
     properties('tryserver.blink', 'mac_blink_rel', enable_gpu_tests=True) +
     api.platform.name('mac') +
-    api.step_data(with_patch, canned_test(passing=True)) +
+    api.override_step_data(with_patch, canned_test(passing=True)) +
     api.override_step_data(
         'pixel_test on Intel GPU (with patch) on Mac',
         api.json.canned_telemetry_gpu_output(passing=False, swarming=True)) +

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/761343003/20001

6 years ago (2014-12-01 12:00:56 UTC) #9

commit-bot: I haz the power

Failed to apply patch for build/scripts/slave/recipes/blink_trybot.py: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years ago (2014-12-01 12:01:07 UTC) #11

Failed to apply patch for build/scripts/slave/recipes/blink_trybot.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipes/blink_trybot.py
  Hunk #1 FAILED at 372.
  Hunk #2 succeeded at 401 (offset -3 lines).
  Hunk #3 succeeded at 486 (offset -3 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
build/scripts/slave/recipes/blink_trybot.py.rej

Patch:       build/scripts/slave/recipes/blink_trybot.py
Index: scripts/slave/recipes/blink_trybot.py
diff --git build/scripts/slave/recipes/blink_trybot.py
build/scripts/slave/recipes/blink_trybot.py
index
59872e911a8140a95a96af968661795b86504d47..dd992feca84df899e9cd1f827e59edb7251c1178
100644
--- a/build/scripts/slave/recipes/blink_trybot.py
+++ b/build/scripts/slave/recipes/blink_trybot.py
@@ -372,7 +372,7 @@ def GenSteps(api):
     api.chromium.compile()
     api.isolate.isolate_tests(api.chromium.output_dir)
 
-  tests.append(api.chromium.steps.BlinkTest(api))
+  tests.append(api.chromium.steps.BlinkTest())
 
   api.test_utils.determine_new_failures(api, tests, deapply_patch_fn)
 
@@ -404,10 +404,10 @@ def GenTests(api):
         for pass_first in (True, False):
           test = (
             api.test(test_name + ('_pass' if pass_first else '_fail')) +
-            api.step_data(with_patch, canned_test(passing=pass_first))
+            api.override_step_data(with_patch, canned_test(passing=pass_first))
           )
           if not pass_first:
-            test += api.step_data(
+            test += api.override_step_data(
                 without_patch, canned_test(passing=False, minimal=True))
           tests.append(test)
 
@@ -489,7 +489,7 @@ def GenTests(api):
     api.test('non_cq_tryjob') +
     properties('tryserver.blink', 'win_blink_rel',
                requester='someone@chromium.org') +
-    api.step_data(with_patch, canned_test(passing=True))
+    api.override_step_data(with_patch, canned_test(passing=True))
   )
 
   yield (

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/761343003/1

6 years ago (2014-12-01 12:16:59 UTC) #14

commit-bot: I haz the power

Committed patchset #1 (id:1) as http://src.chromium.org/viewvc/chrome?view=rev&revision=293152

6 years ago (2014-12-01 12:18:57 UTC) #15

Message was sent while issue was closed.

lgtm

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages

Powered by Google App Engine

This is Rietveld 408576698