| Index: masters/master.chromiumos.tryserver/config.current.txt
|
| diff --git a/masters/master.chromiumos.tryserver/config.current.txt b/masters/master.chromiumos.tryserver/config.current.txt
|
| index b5ff5d28e0c2617de1fff5caaca5372a30369db1..2ebd27700429db1ce76a5bda6fb28a3c96ccca25 100644
|
| --- a/masters/master.chromiumos.tryserver/config.current.txt
|
| +++ b/masters/master.chromiumos.tryserver/config.current.txt
|
| @@ -9,56 +9,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - '--clobber',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': 'etc',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {'cbb_variant': 'etc'},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -92,56 +65,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'compile-only-pre-cq',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -257,56 +203,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'no-vmtest-pre-cq',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -422,56 +341,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'pre-cq',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -587,56 +479,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'wificell-pre-cq',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -702,56 +567,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'asan',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -785,56 +623,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'branch-util',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -868,56 +679,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'chrome-perf',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -951,56 +735,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'chrome-pfq',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1034,56 +791,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'chrome-pfq-informational',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1117,56 +847,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'chromium-pfq',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1200,56 +903,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'chromium-pfq-informational',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1283,56 +959,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'chromiumos-sdk',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1366,56 +1015,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'depthcharge-firmware',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1449,56 +1071,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'depthcharge-full-firmware',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1532,56 +1127,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'factory',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1615,56 +1183,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'firmware',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1698,56 +1239,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'full',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1781,56 +1295,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'incremental',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1864,56 +1351,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'internal-toolchain-major',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -1947,56 +1407,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'internal-toolchain-minor',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2030,56 +1463,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'llvm',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2113,56 +1519,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'paladin',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2196,56 +1575,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'payloads',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2279,56 +1631,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'pre-cq-launcher',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2362,56 +1687,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'pre-flight-branch',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2445,56 +1743,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'refresh-packages',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2528,56 +1799,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'release',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2611,56 +1855,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'release-afdo-generate',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2694,56 +1911,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'release-afdo-use',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2777,56 +1967,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'sync-test-cbuildbot',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2860,56 +2023,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'telemetry',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -2943,56 +2079,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'test-ap',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -3026,56 +2135,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'toolchain-major',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -3109,56 +2191,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'toolchain-minor',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -3192,56 +2247,29 @@ config = {
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': [
|
| - 'gclient',
|
| - 'sync',
|
| - '--verbose',
|
| - '--force',
|
| - '--delete_unversioned_trees',
|
| - ],
|
| - 'description': 'Sync buildbot slave files',
|
| - 'name': 'update_scripts',
|
| - 'timeout': 300,
|
| - 'want_stderr': True,
|
| - 'want_stdout': True,
|
| - 'workdir': '/b',
|
| - },
|
| - ),
|
| - (
|
| - <class buildbot.steps.shell.ShellCommand>,
|
| - {
|
| - 'command': 'rm -rf "chromite" && /usr/bin/git retry clone https://chromium.googlesource.com/chromiumos/chromite.git && cd "chromite" && /usr/bin/git checkout master',
|
| - 'description': 'Clear and Clone chromite',
|
| - 'haltOnFailure': True,
|
| - 'name': 'Clear and Clone chromite',
|
| - },
|
| - ),
|
| - (
|
| <class master.chromium_step.AnnotatedCommand>,
|
| {
|
| + 'active_master': <class 'master_site_config.ChromiumOSTryServer'>,
|
| 'command': [
|
| - 'chromite/bin/cbuildbot',
|
| - <buildbot.process.properties.WithProperties instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.Property instance>,
|
| - <master.master_utils.ConditionalProperty instance>,
|
| - <buildbot.process.properties.WithProperties instance>,
|
| + 'python',
|
| + '-u',
|
| + '../../../scripts/slave/annotated_run.py',
|
| + <master.factory.commands.WithJsonProperties instance>,
|
| + '--factory-properties-gz=eNqrVipKTc4sSFWyUkouyi/WT04qzcxJScoviS8pqszKT1KqBQDYvgzK',
|
| ],
|
| - 'description': 'cbuildbot',
|
| + 'description': 'running steps via annotated script',
|
| + 'haltOnFailure': True,
|
| 'maxTime': 57600,
|
| - 'name': 'cbuildbot',
|
| + 'name': 'steps',
|
| 'timeout': 9000,
|
| - 'usePTY': False,
|
| },
|
| ),
|
| ],
|
| - properties: Properties(**{}),
|
| + properties: Properties(**{'recipe': 'cros/cbuildbot_tryjob'}),
|
| },
|
| 'name': u'tot-asan-informational',
|
| 'nextSlaveAndBuild': <chromiumos_tryserver_util.NextSlaveAndBuild object>,
|
| + 'properties': {},
|
| 'slavenames': [
|
| 'build275-m2',
|
| 'build272-m2',
|
| @@ -3278,8 +2306,8 @@ config = {
|
| 'ssdicts': 1000,
|
| },
|
| 'change_source': [
|
| - <buildbot.changes.gitpoller.GitPoller instance>,
|
| - <buildbot.changes.gitpoller.GitPoller instance>,
|
| + <master.gitiles_poller.GitilesPoller instance>,
|
| + <master.gitiles_poller.GitilesPoller instance>,
|
| ],
|
| 'eventHorizon': 200,
|
| 'logHorizon': 3000,
|
| @@ -5048,8 +4076,8 @@ config = {
|
| email_footer: '\n<strong>Please send bugs and questions to chromeos-build@google.com. You can\nalso reply to this email.</strong>\n',
|
| services: [],
|
| pollers: [
|
| - <buildbot.changes.gitpoller.GitPoller instance>,
|
| - <buildbot.changes.gitpoller.GitPoller instance>,
|
| + <master.gitiles_poller.GitilesPoller instance>,
|
| + <master.gitiles_poller.GitilesPoller instance>,
|
| ],
|
| builderNames: [],
|
| properties: Properties(**{'scheduler': 'cros_try_job_git'}),
|
|
|