Remove unused ScoringLoadBalancer plug-in and preference attribute
Change-Id: Id30b1b60f98fd9f42ebdf66d2ee6141710f9ffa6
diff --git a/jenkins/BUILD b/jenkins/BUILD
index 4d29186..7384eea 100644
--- a/jenkins/BUILD
+++ b/jenkins/BUILD
@@ -55,7 +55,6 @@
WINDOWS_PREFIX,
WINDOWS_COUNT,
num_executors = 1,
- preference = 1,
remote_fs = "c:\\jenkins",
tunnel = "jenkins:50000",
)
diff --git a/jenkins/build_defs/jenkins_node.bzl b/jenkins/build_defs/jenkins_node.bzl
index 31fa3b7..4b99bd4 100644
--- a/jenkins/build_defs/jenkins_node.bzl
+++ b/jenkins/build_defs/jenkins_node.bzl
@@ -20,8 +20,8 @@
JENKINS_SERVER = "http://jenkins:80"
def jenkins_node(name, remote_fs = "/home/ci", num_executors = 1, mode = "NORMAL",
- labels = [], docker_base = None, preference = 1,
- visibility = None, tunnel = None):
+ labels = [], docker_base = None, visibility = None,
+ tunnel = None):
"""Create a node configuration on Jenkins, with possible docker image.
Args:
@@ -34,8 +34,6 @@
docker_base: base for the corresponding docker image to create if we should create one
(if docker_base is not specified, then a corresponding machine should be configured
to connect to the Jenkins master).
- preference: A preference factor, if a node as a factor of 1 and another a factor of
- 4, then the second one will be scheduled 4 time more jobs than the first one.
visibility: rule visibility.
"""
if tunnel:
@@ -55,14 +53,9 @@
<retentionStrategy class="hudson.slaves.RetentionStrategy$$Always"/>
<launcher class="hudson.slaves.JNLPLauncher">%s</launcher>
<label>%s</label>
- <nodeProperties>
- <jp.ikedam.jenkins.plugins.scoringloadbalancer.preferences.BuildPreferenceNodeProperty plugin="scoring-load-balancer@1.0.1">
- <preference>%s</preference>
- </jp.ikedam.jenkins.plugins.scoringloadbalancer.preferences.BuildPreferenceNodeProperty>
- </nodeProperties>
</slave>
EOF
-""" % (name, remote_fs, num_executors, mode, tunnel, " ".join([name] + labels), preference),
+""" % (name, remote_fs, num_executors, mode, tunnel, " ".join([name] + labels)),
outs = ["nodes/%s/config.xml" % name],
visibility = visibility,
)
diff --git a/jenkins/config/jp.ikedam.jenkins.plugins.scoringloadbalancer.ScoringLoadBalancer.xml b/jenkins/config/jp.ikedam.jenkins.plugins.scoringloadbalancer.ScoringLoadBalancer.xml
deleted file mode 100644
index 3f6bcf2..0000000
--- a/jenkins/config/jp.ikedam.jenkins.plugins.scoringloadbalancer.ScoringLoadBalancer.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<jp.ikedam.jenkins.plugins.scoringloadbalancer.ScoringLoadBalancer_-DescriptorImpl plugin="scoring-load-balancer@1.0.1">
- <enabled>true</enabled>
- <reportScoresEnabled>false</reportScoresEnabled>
- <scoringRuleList>
- <jp.ikedam.jenkins.plugins.scoringloadbalancer.rules.NodePreferenceScoringRule>
- <nodesPreferenceScale>10</nodesPreferenceScale>
- <projectPreferenceScale>10</projectPreferenceScale>
- </jp.ikedam.jenkins.plugins.scoringloadbalancer.rules.NodePreferenceScoringRule>
- </scoringRuleList>
-</jp.ikedam.jenkins.plugins.scoringloadbalancer.ScoringLoadBalancer_-DescriptorImpl>
