This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new aee0953 Add utility slave (#13383)
aee0953 is described below
commit aee0953e10c82643e3dffd0be009edabd70d6f98
Author: Marco de Abreu <[email protected]>
AuthorDate: Fri Nov 23 22:25:36 2018 +0100
Add utility slave (#13383)
---
Jenkinsfile | 4 ++--
ci/Jenkinsfile_docker_cache | 4 ++--
ci/Jenkinsfile_utils.groovy | 7 ++++---
ci/jenkins/Jenkinsfile_centos_cpu | 4 ++--
ci/jenkins/Jenkinsfile_centos_gpu | 4 ++--
ci/jenkins/Jenkinsfile_clang | 4 ++--
ci/jenkins/Jenkinsfile_edge | 4 ++--
ci/jenkins/Jenkinsfile_miscellaneous | 4 ++--
ci/jenkins/Jenkinsfile_sanity | 4 ++--
ci/jenkins/Jenkinsfile_unix_cpu | 4 ++--
ci/jenkins/Jenkinsfile_unix_gpu | 4 ++--
ci/jenkins/Jenkinsfile_website | 4 ++--
ci/jenkins/Jenkinsfile_windows_cpu | 4 ++--
ci/jenkins/Jenkinsfile_windows_gpu | 4 ++--
docs/Jenkinsfile | 4 ++--
docs/Jenkinsfile-dev | 4 ++--
tests/nightly/Jenkinsfile | 4 ++--
tests/nightly/JenkinsfileForBinaries | 4 ++--
tests/nightly/broken_link_checker_test/JenkinsfileForBLC | 4 ++--
.../nightly/model_backwards_compatibility_check/JenkinsfileForMBCC | 4 ++--
20 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a7e3dbd..79392b4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -143,12 +143,12 @@ def deploy_docs() {
}
}
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/Jenkinsfile_docker_cache b/ci/Jenkinsfile_docker_cache
index 77f0122..35e6ff9 100644
--- a/ci/Jenkinsfile_docker_cache
+++ b/ci/Jenkinsfile_docker_cache
@@ -23,12 +23,12 @@
// timeout in minutes
total_timeout = 300
-node('restricted-mxnetlinux-cpu') {
+node('restricted-utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'restricted-mxnetlinux-cpu', linux_gpu:
'restricted-mxnetlinux-gpu', linux_gpu_p3: 'restricted-mxnetlinux-gpu-p3',
windows_cpu: 'restricted-mxnetwindows-cpu', windows_gpu:
'restricted-mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'restricted-utility', linux_cpu:
'restricted-mxnetlinux-cpu', linux_gpu: 'restricted-mxnetlinux-gpu',
linux_gpu_p3: 'restricted-mxnetlinux-gpu-p3', windows_cpu:
'restricted-mxnetwindows-cpu', windows_gpu: 'restricted-mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/Jenkinsfile_utils.groovy b/ci/Jenkinsfile_utils.groovy
index 1c4570a..fb84e00 100644
--- a/ci/Jenkinsfile_utils.groovy
+++ b/ci/Jenkinsfile_utils.groovy
@@ -165,7 +165,7 @@ def get_repo_url() {
}
def update_github_commit_status(state, message) {
- node(NODE_LINUX_CPU) {
+ node(NODE_UTILITY) {
// NOTE: https://issues.jenkins-ci.org/browse/JENKINS-39482
//The GitHubCommitStatusSetter requires that the Git Server is defined
under
//*Manage Jenkins > Configure System > GitHub > GitHub Servers*.
@@ -233,6 +233,7 @@ def assign_node_labels(args) {
NODE_LINUX_GPU_P3 = args.linux_gpu_p3
NODE_WINDOWS_CPU = args.windows_cpu
NODE_WINDOWS_GPU = args.windows_gpu
+ NODE_UTILITY = args.utility
}
def main_wrapper(args) {
@@ -252,14 +253,14 @@ def main_wrapper(args) {
currentBuild.result = "SUCCESS"
update_github_commit_status('SUCCESS', 'Job succeeded')
} catch (caughtError) {
- node(NODE_LINUX_CPU) {
+ node(NODE_UTILITY) {
sh "echo caught ${caughtError}"
err = caughtError
currentBuild.result = "FAILURE"
update_github_commit_status('FAILURE', 'Job failed')
}
} finally {
- node(NODE_LINUX_CPU) {
+ node(NODE_UTILITY) {
// Call failure handler
args['failure_handler']()
diff --git a/ci/jenkins/Jenkinsfile_centos_cpu
b/ci/jenkins/Jenkinsfile_centos_cpu
index 6d704bf..3b66f81 100644
--- a/ci/jenkins/Jenkinsfile_centos_cpu
+++ b/ci/jenkins/Jenkinsfile_centos_cpu
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_centos_gpu
b/ci/jenkins/Jenkinsfile_centos_gpu
index d99177e..aec3b90 100644
--- a/ci/jenkins/Jenkinsfile_centos_gpu
+++ b/ci/jenkins/Jenkinsfile_centos_gpu
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_clang b/ci/jenkins/Jenkinsfile_clang
index 2fa9b83..61920cf 100644
--- a/ci/jenkins/Jenkinsfile_clang
+++ b/ci/jenkins/Jenkinsfile_clang
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_edge b/ci/jenkins/Jenkinsfile_edge
index 64324cc..c101ba1 100644
--- a/ci/jenkins/Jenkinsfile_edge
+++ b/ci/jenkins/Jenkinsfile_edge
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_miscellaneous
b/ci/jenkins/Jenkinsfile_miscellaneous
index 367cd6f..c02cc99 100644
--- a/ci/jenkins/Jenkinsfile_miscellaneous
+++ b/ci/jenkins/Jenkinsfile_miscellaneous
@@ -24,13 +24,13 @@
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_sanity b/ci/jenkins/Jenkinsfile_sanity
index cb74b03..123fedf 100644
--- a/ci/jenkins/Jenkinsfile_sanity
+++ b/ci/jenkins/Jenkinsfile_sanity
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu
index 65da416..9c9a415 100644
--- a/ci/jenkins/Jenkinsfile_unix_cpu
+++ b/ci/jenkins/Jenkinsfile_unix_cpu
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_unix_gpu b/ci/jenkins/Jenkinsfile_unix_gpu
index f02458d..cf92836 100644
--- a/ci/jenkins/Jenkinsfile_unix_gpu
+++ b/ci/jenkins/Jenkinsfile_unix_gpu
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_website b/ci/jenkins/Jenkinsfile_website
index a2c151e..050f509 100644
--- a/ci/jenkins/Jenkinsfile_website
+++ b/ci/jenkins/Jenkinsfile_website
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_windows_cpu
b/ci/jenkins/Jenkinsfile_windows_cpu
index f7f5442..9e70df3 100644
--- a/ci/jenkins/Jenkinsfile_windows_cpu
+++ b/ci/jenkins/Jenkinsfile_windows_cpu
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', windows_cpu:
'mxnetwindows-cpu')
+utils.assign_node_labels(utility: 'utility', windows_cpu: 'mxnetwindows-cpu')
utils.main_wrapper(
core_logic: {
diff --git a/ci/jenkins/Jenkinsfile_windows_gpu
b/ci/jenkins/Jenkinsfile_windows_gpu
index 906b6c7..69fd073 100644
--- a/ci/jenkins/Jenkinsfile_windows_gpu
+++ b/ci/jenkins/Jenkinsfile_windows_gpu
@@ -23,13 +23,13 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
custom_steps = load('ci/jenkins/Jenkins_steps.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', windows_cpu: 'mxnetwindows-cpu',
windows_gpu: 'mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/docs/Jenkinsfile b/docs/Jenkinsfile
index e20d984..b65bfad 100644
--- a/docs/Jenkinsfile
+++ b/docs/Jenkinsfile
@@ -23,12 +23,12 @@
// timeout in minutes
max_time = 120
-node('restricted-mxnetlinux-cpu') {
+node('restricted-utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'restricted-mxnetlinux-cpu', linux_gpu:
'restricted-mxnetlinux-gpu', linux_gpu_p3: 'restricted-mxnetlinux-gpu-p3',
windows_cpu: 'restricted-mxnetwindows-cpu', windows_gpu:
'restricted-mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'restricted-utility', linux_cpu:
'restricted-mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
diff --git a/docs/Jenkinsfile-dev b/docs/Jenkinsfile-dev
index 169ebe1..760a2f9 100644
--- a/docs/Jenkinsfile-dev
+++ b/docs/Jenkinsfile-dev
@@ -23,12 +23,12 @@
// timeout in minutes
max_time = 120
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
diff --git a/tests/nightly/Jenkinsfile b/tests/nightly/Jenkinsfile
index de550a0..d769f08 100755
--- a/tests/nightly/Jenkinsfile
+++ b/tests/nightly/Jenkinsfile
@@ -20,12 +20,12 @@
mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a,
3rdparty/nnvm/lib/libnnvm.a'
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/tests/nightly/JenkinsfileForBinaries
b/tests/nightly/JenkinsfileForBinaries
index bddf821..eb00309 100755
--- a/tests/nightly/JenkinsfileForBinaries
+++ b/tests/nightly/JenkinsfileForBinaries
@@ -20,12 +20,12 @@
mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a,
3rdparty/tvm/nnvm/lib/libnnvm.a'
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu',
linux_gpu: 'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
utils.main_wrapper(
core_logic: {
diff --git a/tests/nightly/broken_link_checker_test/JenkinsfileForBLC
b/tests/nightly/broken_link_checker_test/JenkinsfileForBLC
index a650744..8b64543 100755
--- a/tests/nightly/broken_link_checker_test/JenkinsfileForBLC
+++ b/tests/nightly/broken_link_checker_test/JenkinsfileForBLC
@@ -18,12 +18,12 @@
//
//This is a Jenkinsfile for the broken link checker test.
-node('mxnetlinux-cpu') {
+node('utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'mxnetlinux-cpu', linux_gpu:
'mxnetlinux-gpu', linux_gpu_p3: 'mxnetlinux-gpu-p3', windows_cpu:
'mxnetwindows-cpu', windows_gpu: 'mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
diff --git
a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
index cb35161..08f5621 100644
--- a/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
+++ b/tests/nightly/model_backwards_compatibility_check/JenkinsfileForMBCC
@@ -20,12 +20,12 @@
mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, 3rdparty/dmlc-core/libdmlc.a,
3rdparty/tvm/nnvm/lib/libnnvm.a'
-node('restricted-mxnetlinux-cpu') {
+node('restricted-utility') {
// Loading the utilities requires a node context unfortunately
checkout scm
utils = load('ci/Jenkinsfile_utils.groovy')
}
-utils.assign_node_labels(linux_cpu: 'restricted-mxnetlinux-cpu', linux_gpu:
'restricted-mxnetlinux-gpu', linux_gpu_p3: 'restricted-mxnetlinux-gpu-p3',
windows_cpu: 'restricted-mxnetwindows-cpu', windows_gpu:
'restricted-mxnetwindows-gpu')
+utils.assign_node_labels(utility: 'restricted-utility', linux_cpu:
'restricted-mxnetlinux-cpu')
utils.main_wrapper(
core_logic: {
