Merge ~michihenning/unity-api-team-jenkins:remove-old-slaves into unity-api-team-jenkins:master

Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 6996c8bf073a87b9b99d4c6cbae00a2ce58713a2
Merged at revision: 6996c8bf073a87b9b99d4c6cbae00a2ce58713a2
Proposed branch: ~michihenning/unity-api-team-jenkins:remove-old-slaves
Merge into: unity-api-team-jenkins:master
Diff against target: 39 lines (+1/-5)
1 file modified
unity-api-team.yaml (+1/-5)
Reviewer Review Type Date Requested Status
Unity API Team Pending
Review via email: mp+312992@code.launchpad.net

Commit message

Removed old Arm slaves (slave-6 and slave13) from config.

Description of the change

Removed old Arm slaves (slave-6 and slave13) from config.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/unity-api-team.yaml b/unity-api-team.yaml
2index f884e14..d84a78c 100644
3--- a/unity-api-team.yaml
4+++ b/unity-api-team.yaml
5@@ -36,12 +36,10 @@
6 # The list of all slaves available in your jenkins instance. Currently only
7 # the run-commands job uses that list.
8 all_slaves:
9- - jenkins-slave-6
10 - jenkins-slave-7
11 - jenkins-slave-8
12 - jenkins-slave-9
13 - jenkins-slave-12
14- - jenkins-slave-13
15 - jenkins-slave-14
16 - jenkins-slave-15
17 - jenkins-slave-16
18@@ -49,12 +47,10 @@
19
20 # The list of slaves to create chroots and perform builds on.
21 build_slaves:
22- - jenkins-slave-6 # arm64 && armhf
23 - jenkins-slave-7 # amd64 && i386
24 - jenkins-slave-8 # amd64 && i386
25 - jenkins-slave-9 # amd64 && i386
26 - jenkins-slave-12 # amd64 && i386
27- - jenkins-slave-13 # arm64 && armhf
28 - jenkins-slave-14 # arm64 && armhf
29 - jenkins-slave-15 # arm64 && armhf
30 - jenkins-slave-16 # arm64 && armhf
31@@ -81,7 +77,7 @@
32 #
33 # Available axes: node, arch and release.
34 chroot-filter:
35- (node=="jenkins-slave-7" || node=="jenkins-slave-8" || node=="jenkins-slave-9" || node=="jenkins-slave-12").implies(arch=="amd64" || arch=="i386") && (node=="jenkins-slave-6" || node=="jenkins-slave-13" || node=="jenkins-slave-14" || node=="jenkins-slave-15" || node=="jenkins-slave-16" || node=="jenkins-slave-17").implies(arch=="armhf" || arch=="arm64")
36+ (node=="jenkins-slave-7" || node=="jenkins-slave-8" || node=="jenkins-slave-9" || node=="jenkins-slave-12").implies(arch=="amd64" || arch=="i386") && (node=="jenkins-slave-14" || node=="jenkins-slave-15" || node=="jenkins-slave-16" || node=="jenkins-slave-17").implies(arch=="armhf" || arch=="arm64")
37
38 # This filter is applied to binary package builds, you can limit the
39 # arch/node combinations of performed builds.

Subscribers

People subscribed via source and target branches

to all changes: