From e0c10b10dfa403465403170a0a73c13af8899236 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Tue, 19 Sep 2017 19:34:24 +0200
Subject: [PATCH] Use the new darwin slaves.
---
ci.hocon | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/ci.hocon b/ci.hocon
index 81f8c5c522..100b2ade75 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -68,10 +68,8 @@ packagesLinux : ${pkgEnvironment} {
packagesDarwin : {
"pip:astroid" : "==1.1.0"
"pip:pylint" : "==1.1.0"
- "xz" : ""
- "pcre" : ""
- "z" : ""
- "curl" : ""
+ "xz" : "==5.2.2"
+ "pcre" : "==8.38"
}
# Common settings for all builds but note that it uses the Linux package settings,
@@ -116,8 +114,7 @@ darwinEnvironment : {
}
gateTestDarwin : ${gateTestCommon} ${darwinEnvironment} {
- packages : ${packagesDarwin} {
- }
+ packages : ${packagesDarwin}
}
gateTestLinuxNFI : ${gateTestCommon} {
@@ -184,7 +181,7 @@ builds = [
${gateTestLinux} {capabilities : [linux, amd64, fast], targets : [gate], name: "gate-test-linux-amd64"}
${gateTestLinuxNFI} {capabilities : [linux, amd64, fast], targets : [gate], name: "gate-test-linux-nfi-amd64"}
${gateTestNoSpecialsLinux} {capabilities : [linux, amd64, fast], targets : [gate], name: "gate-test-linux-amd64-nospecials"}
- ${gateTestDarwin} {capabilities : [darwin_elcapitan, amd64], targets : [gate], name: "gate-test-darwin-amd64"}
+ ${gateTestDarwin} {capabilities : [darwin_sierra, amd64], targets : [gate], name: "gate-test-darwin-amd64"}
${gateStyle} {capabilities : [linux, amd64], targets : [gate], name: "gate-style-linux-amd64"}
${rbcheck} {capabilities : [linux, amd64], targets : [gate], name: "gate-rbcheck-linux-amd64"}
${internalPkgtest} {capabilities : [linux, amd64], targets : [gate], name: "gate-internal-pkgtest-linux-amd64"}
--
GitLab