From ca8c6144ba2cd9f9dc623c4f1f305ad84e600a7d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 10 Sep 2015 14:21:35 -0400 Subject: [PATCH] Run matrix parent jobs on master node --- jobs/babeltrace.yaml | 2 +- jobs/kernel.yaml | 2 +- jobs/liburcu.yaml | 2 +- jobs/lttng-modules.yaml | 2 +- jobs/lttng-tools.yaml | 2 +- jobs/lttng-ust.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 509cd1d..75ea54f 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -49,7 +49,7 @@ defaults: babeltrace project-type: matrix - node: 'x86-32 || x86-64' # Applies only to matrix flyweight task + node: 'master' # Applies only to matrix flyweight task axes: - axis: type: slave diff --git a/jobs/kernel.yaml b/jobs/kernel.yaml index 0b59663..0a1cfd7 100644 --- a/jobs/kernel.yaml +++ b/jobs/kernel.yaml @@ -45,7 +45,7 @@ defaults: kernel project-type: matrix - node: 'x86-32 || x86-64' # Applies only to matrix flyweight task + node: 'master' # Applies only to matrix flyweight task axes: - axis: type: slave diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 79493a7..f264f63 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -62,7 +62,7 @@ defaults: liburcu project-type: matrix - node: 'x86-32 || x86-64' # Applies only to matrix flyweight task + node: 'master' # Applies only to matrix flyweight task axes: - axis: type: slave diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml index ac30cf0..7c5fb39 100644 --- a/jobs/lttng-modules.yaml +++ b/jobs/lttng-modules.yaml @@ -53,7 +53,7 @@ defaults: lttng-modules project-type: matrix - node: 'x86-32 || x86-64' # Applies only to matrix flyweight task + node: 'master' # Applies only to matrix flyweight task axes: - axis: type: slave diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index e1c4a2b..ca1e383 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -44,7 +44,7 @@ defaults: lttng-tools project-type: matrix - node: 'x86-32 || x86-64' # Applies only to matrix flyweight task + node: 'master' # Applies only to matrix flyweight task execution-strategy: combination-filter: | (build=="std") || (liburcu_version=="master") diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml index cda7068..25dc66e 100644 --- a/jobs/lttng-ust.yaml +++ b/jobs/lttng-ust.yaml @@ -44,7 +44,7 @@ defaults: lttng-ust project-type: matrix - node: 'x86-32 || x86-64' # Applies only to matrix flyweight task + node: 'master' # Applies only to matrix flyweight task execution-strategy: combination-filter: | (build=="std") || (liburcu_version=="master") -- 2.34.1