Skip to content
Snippets Groups Projects
Commit e0c10b10 authored by Danilo Ansaloni's avatar Danilo Ansaloni
Browse files

Use the new darwin slaves.

parent ebafd4a3
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 7 deletions
ci.hocon
+ 4
− 7
View file @ e0c10b10
...@@ -68,10 +68,8 @@ packagesLinux : ${pkgEnvironment} { ...@@ -68,10 +68,8 @@ packagesLinux : ${pkgEnvironment} {
packagesDarwin : { packagesDarwin : {
"pip:astroid" : "==1.1.0" "pip:astroid" : "==1.1.0"
"pip:pylint" : "==1.1.0" "pip:pylint" : "==1.1.0"
"xz" : "" "xz" : "==5.2.2"
"pcre" : "" "pcre" : "==8.38"
"z" : ""
"curl" : ""
} }
# Common settings for all builds but note that it uses the Linux package settings, # Common settings for all builds but note that it uses the Linux package settings,
...@@ -116,8 +114,7 @@ darwinEnvironment : { ...@@ -116,8 +114,7 @@ darwinEnvironment : {
} }
gateTestDarwin : ${gateTestCommon} ${darwinEnvironment} { gateTestDarwin : ${gateTestCommon} ${darwinEnvironment} {
packages : ${packagesDarwin} { packages : ${packagesDarwin}
}
} }
gateTestLinuxNFI : ${gateTestCommon} { gateTestLinuxNFI : ${gateTestCommon} {
...@@ -184,7 +181,7 @@ builds = [ ...@@ -184,7 +181,7 @@ builds = [
${gateTestLinux} {capabilities : [linux, amd64, fast], targets : [gate], name: "gate-test-linux-amd64"} ${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"} ${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"} ${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"} ${gateStyle} {capabilities : [linux, amd64], targets : [gate], name: "gate-style-linux-amd64"}
${rbcheck} {capabilities : [linux, amd64], targets : [gate], name: "gate-rbcheck-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"} ${internalPkgtest} {capabilities : [linux, amd64], targets : [gate], name: "gate-internal-pkgtest-linux-amd64"}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment