Skip to content
Permalink
Browse files

Revert "Point stable config at yesterday's canary to try out branch CQ."

This reverts commit 43e5eca.

Reason for revert: Done with experimenting with branch CQ.

Original change's description:
> Point stable config at yesterday's canary to try out branch CQ.
> 
> Change-Id: I412e418b67df803a9e96e792bdff392e03169d25
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954291
> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
> Commit-Queue: Stephen Martinis <martiniss@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#722204}

TBR=martiniss@chromium.org,gbeaty@chromium.org

Change-Id: I479c4b7cc8ebc643a91c2ba06ac8ecc791706ccf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954785
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722254}
  • Loading branch information
kleerwater authored and Commit Bot committed Dec 5, 2019
1 parent 72376ad commit cbf6585bb0581760b915f1ae3e0c9c94871ff67b
@@ -5,7 +5,7 @@ luci.console_view(
repo = 'https://chromium.googlesource.com/chromium/src',
# TODO(gbeaty) Define the main consoles inside the respective versioned
# directories once their contents are stablilized
refs = ['refs/branch-heads/3985'],
refs = ['refs/branch-heads/3904'],
title = 'Chromium Stable Console',
entries = [
luci.console_view_entry(
@@ -424,7 +424,7 @@ config_groups: <
url: "https://chromium-review.googlesource.com"
projects: <
name: "chromium/src"
ref_regexp: "refs/branch-heads/3985"
ref_regexp: "refs/branch-heads/3904"
>
>
verifiers: <
@@ -438,30 +438,40 @@ config_groups: <
tryjob: <
builders: <
name: "chromium/try-stable/android-kitkat-arm-rel"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/android-marshmallow-arm64-rel"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/chromeos-amd64-generic-rel"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/chromium_presubmit"
disable_reuse: true
experiment_percentage: 100
>
builders: <
name: "chromium/try-stable/ios-simulator"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/linux-chromeos-rel"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/linux-rel"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/mac-rel"
experiment_percentage: 1
>
builders: <
name: "chromium/try-stable/win10_chromium_x64_rel_ng"
experiment_percentage: 1
>
retry_config: <
single_quota: 1
@@ -11213,7 +11213,7 @@ consoles: <
id: "main-stable"
name: "Chromium Stable Console"
repo_url: "https://chromium.googlesource.com/chromium/src"
refs: "regexp:refs/branch-heads/3985"
refs: "regexp:refs/branch-heads/3904"
manifest_name: "REVISION"
builders: <
name: "buildbucket/luci.chromium.ci-stable/Linux Builder"
@@ -495,7 +495,7 @@ trigger {

gitiles: {
repo: "https://chromium.googlesource.com/chromium/src"
refs: "refs/branch-heads/3985"
refs: "refs/branch-heads/3904"
}

# TODO(gbeaty) Move builders from stable-gitiles-trigger as they are made green
@@ -495,7 +495,7 @@ trigger {

gitiles: {
repo: "https://chromium.googlesource.com/chromium/src"
refs: "refs/branch-heads/3985"
refs: "refs/branch-heads/3904"
}

# TODO(gbeaty) Move builders from stable-gitiles-trigger as they are made green
@@ -116,6 +116,8 @@ android_builder(
name = 'android-kitkat-arm-rel',
goma_jobs = goma.jobs.J150,
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
)

@@ -126,6 +128,8 @@ android_builder(
ssd = True,
use_java_coverage = True,
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
)

@@ -142,13 +146,17 @@ chromiumos_builder(
name = 'chromeos-amd64-generic-rel',
goma_enable_ats = True,
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
)

chromiumos_builder(
name = 'linux-chromeos-rel',
goma_jobs = goma.jobs.J150,
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
use_clang_coverage = True,
)
@@ -172,6 +180,9 @@ linux_builder(
'repo_name': 'chromium',
},
tryjob = tryjob(
disable_reuse = True,
# TODO(https://crbug.com/1024637) Make non-experimental
experiment_percentage = 100,
),
)

@@ -180,6 +191,8 @@ linux_builder(
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
tryjob = tryjob(
# TODO(https://crbug.com/1024637) Make non-experimental
experiment_percentage = 1,
),
use_clang_coverage = True,
)
@@ -205,6 +218,8 @@ mac_builder(
name = 'mac-rel',
goma_jobs = goma.jobs.J150,
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
)

@@ -227,6 +242,8 @@ def mac_ios_builder(*, name, executable=luci.recipe(name = 'ios/try'), **kwargs)
mac_ios_builder(
name = 'ios-simulator',
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
)

@@ -246,5 +263,7 @@ win_builder(
os = os.WINDOWS_10,
ssd = True,
tryjob = tryjob(
# TODO(https://crbug.com/1024641) Make non-experimental
experiment_percentage = 1,
),
)
@@ -1,4 +1,4 @@
vars = struct(
ref = 'refs/branch-heads/3985',
cq_ref_regexp = 'refs/branch-heads/3985',
ref = 'refs/branch-heads/3904',
cq_ref_regexp = 'refs/branch-heads/3904',
)

0 comments on commit cbf6585

Please sign in to comment.
You can’t perform that action at this time.