| Index: masters/master.chromiumos/config.current.txt
|
| diff --git a/masters/master.chromiumos/config.current.txt b/masters/master.chromiumos/config.current.txt
|
| index c75f9386060eb9029b7824d4382a21ef71dfb50f..fbb6b42b7eabe595e040ac1f91bd820d7ec3cd53 100644
|
| --- a/masters/master.chromiumos/config.current.txt
|
| +++ b/masters/master.chromiumos/config.current.txt
|
| @@ -5,8 +5,9 @@ config = {
|
| 'builders': [
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'x86-generic-paladin',
|
| + 'builddir': 'amd64-generic-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -47,7 +48,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'x86-generic-paladin',
|
| + 'amd64-generic-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -59,13 +60,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'x86-generic paladin',
|
| - 'slavenames': ['build174-m2'],
|
| + 'name': 'amd64-generic paladin',
|
| + 'slavenames': ['build141-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'amd64-generic-paladin',
|
| + 'builddir': 'arm-generic-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -106,7 +108,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'amd64-generic-paladin',
|
| + 'arm-generic-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -118,13 +120,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'amd64-generic paladin',
|
| - 'slavenames': ['build141-m2'],
|
| + 'name': 'arm-generic paladin',
|
| + 'slavenames': ['build263-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'amd64-generic_freon-paladin',
|
| + 'builddir': 'gizmo-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -165,7 +168,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'amd64-generic_freon-paladin',
|
| + 'gizmo-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -177,13 +180,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'amd64-generic_freon paladin',
|
| - 'slavenames': ['build182-m2'],
|
| + 'name': 'gizmo paladin',
|
| + 'slavenames': ['build118-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'gizmo-paladin',
|
| + 'builddir': 'mipsel-o32-generic-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -224,7 +228,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'gizmo-paladin',
|
| + 'mipsel-o32-generic-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -236,13 +240,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'gizmo paladin',
|
| - 'slavenames': ['build118-m2'],
|
| + 'name': 'mipsel-o32-generic paladin',
|
| + 'slavenames': ['build112-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'mipsel-o32-generic-paladin',
|
| + 'builddir': 'panther_embedded-minimal-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -283,7 +288,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'mipsel-o32-generic-paladin',
|
| + 'panther_embedded-minimal-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -295,13 +300,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'mipsel-o32-generic paladin',
|
| - 'slavenames': ['build112-m2'],
|
| + 'name': 'panther_embedded-minimal paladin',
|
| + 'slavenames': ['build203-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'arm-generic-paladin',
|
| + 'builddir': 'x86-generic-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -342,7 +348,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'arm-generic-paladin',
|
| + 'x86-generic-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -354,13 +360,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'arm-generic paladin',
|
| - 'slavenames': ['build263-m2'],
|
| + 'name': 'x86-generic paladin',
|
| + 'slavenames': ['build174-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'panther_embedded-minimal-paladin',
|
| + 'builddir': 'amd64-generic_freon-paladin-master',
|
| 'category': '1release full|info',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -401,7 +408,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'panther_embedded-minimal-paladin',
|
| + 'amd64-generic_freon-paladin',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -413,12 +420,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'panther_embedded-minimal paladin',
|
| - 'slavenames': ['build203-m2'],
|
| + 'name': 'amd64-generic_freon paladin',
|
| + 'slavenames': ['build182-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'x86-generic-incremental',
|
| + 'builddir': 'amd64-generic-incremental-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -461,7 +468,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'x86-generic-incremental',
|
| + 'amd64-generic-incremental',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -473,12 +480,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'x86-generic incremental',
|
| - 'slavenames': ['build85-m2'],
|
| + 'name': 'amd64-generic incremental',
|
| + 'slavenames': ['build86-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'amd64-generic-incremental',
|
| + 'builddir': 'daisy-incremental-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -521,7 +528,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'amd64-generic-incremental',
|
| + 'daisy-incremental',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -533,12 +540,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'amd64-generic incremental',
|
| - 'slavenames': ['build86-m2'],
|
| + 'name': 'daisy incremental',
|
| + 'slavenames': ['build87-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'daisy-incremental',
|
| + 'builddir': 'x86-generic-incremental-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -581,7 +588,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'daisy-incremental',
|
| + 'x86-generic-incremental',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -593,12 +600,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'daisy incremental',
|
| - 'slavenames': ['build87-m2'],
|
| + 'name': 'x86-generic incremental',
|
| + 'slavenames': ['build85-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'x86-generic-full',
|
| + 'builddir': 'amd64-generic-full-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -641,7 +648,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'x86-generic-full',
|
| + 'amd64-generic-full',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -653,12 +660,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'x86-generic full',
|
| - 'slavenames': ['build89-m2'],
|
| + 'name': 'amd64-generic full',
|
| + 'slavenames': ['build90-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'amd64-generic-full',
|
| + 'builddir': 'arm-generic-full-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -701,7 +708,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'amd64-generic-full',
|
| + 'arm-generic-full',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -713,12 +720,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'amd64-generic full',
|
| - 'slavenames': ['build90-m2'],
|
| + 'name': 'arm-generic full',
|
| + 'slavenames': ['build92-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'daisy-full',
|
| + 'builddir': 'daisy-full-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -778,7 +785,7 @@ config = {
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'arm-generic-full',
|
| + 'builddir': 'mipsel-o32-generic-full-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -821,7 +828,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'arm-generic-full',
|
| + 'mipsel-o32-generic-full',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -833,12 +840,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'arm-generic full',
|
| - 'slavenames': ['build92-m2'],
|
| + 'name': 'mipsel-o32-generic full',
|
| + 'slavenames': ['build93-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'mipsel-o32-generic-full',
|
| + 'builddir': 'x86-generic-full-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -881,7 +888,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'mipsel-o32-generic-full',
|
| + 'x86-generic-full',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -893,12 +900,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'mipsel-o32-generic full',
|
| - 'slavenames': ['build93-m2'],
|
| + 'name': 'x86-generic full',
|
| + 'slavenames': ['build89-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'chromiumos-sdk',
|
| + 'builddir': 'amd64-generic-asan-master',
|
| 'category': '1release full|closer',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -941,10 +948,10 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'chromiumos-sdk',
|
| + 'amd64-generic-asan',
|
| ],
|
| 'description': 'cbuildbot',
|
| - 'maxTime': 79200,
|
| + 'maxTime': 57600,
|
| 'name': 'cbuildbot',
|
| 'timeout': 9000,
|
| 'usePTY': False,
|
| @@ -953,13 +960,14 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'chromiumos sdk',
|
| - 'slavenames': ['build162-m2'],
|
| + 'name': 'amd64-generic ASAN',
|
| + 'slavenames': ['build84-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'refresh-packages',
|
| - 'category': '1release full|info',
|
| + 'builddir': 'x86-generic-asan-master',
|
| + 'category': '1release full|closer',
|
| + 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| (
|
| @@ -1000,7 +1008,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'refresh-packages',
|
| + 'x86-generic-asan',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -1012,13 +1020,13 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'refresh packages (chromium:412795)',
|
| + 'name': 'x86-generic ASAN',
|
| 'slavenames': ['build94-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'x86-generic-ASAN',
|
| - 'category': '1release full|closer',
|
| + 'builddir': 'chromiumos-sdk-master',
|
| + 'category': '1release full|info',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| steps: [
|
| @@ -1060,10 +1068,10 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'x86-generic-asan',
|
| + 'chromiumos-sdk',
|
| ],
|
| 'description': 'cbuildbot',
|
| - 'maxTime': 57600,
|
| + 'maxTime': 79200,
|
| 'name': 'cbuildbot',
|
| 'timeout': 9000,
|
| 'usePTY': False,
|
| @@ -1072,12 +1080,12 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'x86-generic ASAN',
|
| - 'slavenames': ['build94-m2'],
|
| + 'name': 'chromiumos sdk',
|
| + 'slavenames': ['build162-m2'],
|
| },
|
| {
|
| 'auto_reboot': False,
|
| - 'builddir': 'amd64-generic-ASAN',
|
| + 'builddir': 'refresh-packages-master',
|
| 'category': '1release full|info',
|
| 'collapseRequests': <Always Collapse>,
|
| 'factory': BuildFactory {
|
| @@ -1120,7 +1128,7 @@ config = {
|
| '--buildbot',
|
| '--debug',
|
| <master.master_utils.ConditionalProperty instance>,
|
| - 'amd64-generic-asan',
|
| + 'refresh-packages',
|
| ],
|
| 'description': 'cbuildbot',
|
| 'maxTime': 57600,
|
| @@ -1132,8 +1140,8 @@ config = {
|
| ],
|
| properties: Properties(**{}),
|
| },
|
| - 'name': 'amd64-generic ASAN',
|
| - 'slavenames': ['build84-m2'],
|
| + 'name': 'refresh-packages',
|
| + 'slavenames': ['build94-m2'],
|
| },
|
| ],
|
| 'caches': {
|
| @@ -1166,13 +1174,13 @@ config = {
|
| master: None,
|
| services: [],
|
| builderNames: [
|
| - 'x86-generic paladin',
|
| 'amd64-generic paladin',
|
| - 'amd64-generic_freon paladin',
|
| + 'arm-generic paladin',
|
| 'gizmo paladin',
|
| 'mipsel-o32-generic paladin',
|
| - 'arm-generic paladin',
|
| 'panther_embedded-minimal paladin',
|
| + 'x86-generic paladin',
|
| + 'amd64-generic_freon paladin',
|
| ],
|
| treeStableTimer: None,
|
| properties: Properties(**{'scheduler': 'paladin'}),
|
| @@ -1187,17 +1195,14 @@ config = {
|
| master: None,
|
| services: [],
|
| builderNames: [
|
| - 'x86-generic incremental',
|
| 'amd64-generic incremental',
|
| 'daisy incremental',
|
| - 'x86-generic full',
|
| + 'x86-generic incremental',
|
| 'amd64-generic full',
|
| - 'daisy full',
|
| 'arm-generic full',
|
| + 'daisy full',
|
| 'mipsel-o32-generic full',
|
| - 'chromiumos sdk',
|
| - 'x86-generic ASAN',
|
| - 'amd64-generic ASAN',
|
| + 'x86-generic full',
|
| ],
|
| treeStableTimer: None,
|
| properties: Properties(**{'scheduler': 'chromeos'}),
|
| @@ -1216,7 +1221,7 @@ config = {
|
| master: None,
|
| branch: None,
|
| services: [],
|
| - builderNames: ['refresh packages (chromium:412795)'],
|
| + builderNames: [],
|
| properties: Properties(**{'scheduler': 'refresh_pkgs_scheduler'}),
|
| periodicBuildTimer: 86400,
|
| },
|
| @@ -1236,10 +1241,10 @@ config = {
|
| <BuildSlave 'build112-m2', (no builders yet)>,
|
| <BuildSlave 'build92-m2', (no builders yet)>,
|
| <BuildSlave 'build90-m2', (no builders yet)>,
|
| - <BuildSlave 'build182-m2', (no builders yet)>,
|
| + <BuildSlave 'build263-m2', (no builders yet)>,
|
| <BuildSlave 'build94-m2', (no builders yet)>,
|
| <BuildSlave 'build203-m2', (no builders yet)>,
|
| - <BuildSlave 'build263-m2', (no builders yet)>,
|
| + <BuildSlave 'build182-m2', (no builders yet)>,
|
| <BuildSlave 'build87-m2', (no builders yet)>,
|
| ],
|
| 'status': [
|
|
|