Move controller.sh into builder.sh

Change-Id: Id7220c311ca528faa395f9d686d7a218302f92b0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jenkins-scripts/builder.sh b/jenkins-scripts/builder.sh
index 5e477a586ba8473515c1c8e8be08fb5e2d8d37d3..e80945ac19cb81e67da662515e82854f8ae627e8 100755 (executable)
--- a/jenkins-scripts/builder.sh
+++ b/jenkins-scripts/builder.sh
@@ -28,3 +28,53 @@ yum install -y fedora-packager
 
 # Install software for building docs
 yum install -y libxslt-devel
+
+
+
+# disable the firewall
+/bin/bash ./disable_firewall.sh
+
+# install sshpass
+yum install -y sshpass
+
+# vim: sw=2 ts=2 sts=2 et :
+# Installation of Hbase
+mkdir /tmp/Hbase
+cd /tmp/Hbase
+
+wget --no-verbose http://apache.osuosl.org/hbase/hbase-0.94.27/hbase-0.94.27.tar.gz
+
+echo "Installing the Hbase Server..."
+
+tar -xvf hbase-0.94.27.tar.gz
+
+#Installation of Cassandra
+
+
+mkdir /tmp/cassandra
+cd /tmp/cassandra
+
+wget --no-verbose http://apache.osuosl.org/cassandra/2.1.14/apache-cassandra-2.1.14-bin.tar.gz
+
+echo "Installing the Cassandra Server..."
+
+tar -xvf apache-cassandra-2.1.14-bin.tar.gz
+
+# Installation of Elasticsearch node
+
+mkdir /tmp/elasticsearch
+cd /tmp/elasticsearch
+
+wget --no-verbose https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
+
+echo "Installing the Elasticsearch node..."
+
+tar -xvzf elasticsearch-1.7.5.tar.gz
+
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOF
+
+# install crudini command line tool for editing config files
+yum install -y crudini

diff --git a/jenkins-scripts/controller.sh b/jenkins-scripts/controller.sh
deleted file mode 100755 (executable)
index ab4db5e..0000000
--- a/jenkins-scripts/controller.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# disable the firewall
-/bin/bash ./disable_firewall.sh
-
-# install sshpass
-yum install -y sshpass
-
-# vim: sw=2 ts=2 sts=2 et :
-# Installation of Hbase
-mkdir /tmp/Hbase
-cd /tmp/Hbase
-
-wget --no-verbose http://apache.osuosl.org/hbase/hbase-0.94.27/hbase-0.94.27.tar.gz
-
-echo "Installing the Hbase Server..."
-
-tar -xvf hbase-0.94.27.tar.gz
-
-#Installation of Cassandra
-
-
-mkdir /tmp/cassandra
-cd /tmp/cassandra
-
-wget --no-verbose http://apache.osuosl.org/cassandra/2.1.14/apache-cassandra-2.1.14-bin.tar.gz
-
-echo "Installing the Cassandra Server..."
-
-tar -xvf apache-cassandra-2.1.14-bin.tar.gz
-
-# Installation of Elasticsearch node
-
-mkdir /tmp/elasticsearch
-cd /tmp/elasticsearch
-
-wget --no-verbose https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.7.5.tar.gz
-
-echo "Installing the Elasticsearch node..."
-
-tar -xvzf elasticsearch-1.7.5.tar.gz
-
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: ALL
-EOF
-
-# install crudini command line tool for editing config files
-yum install -y crudini

diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
index 8d5b03b89a2c7cce55b3d1494baf8f462fa035ae..6fa6626b8b380ec822f60ed76efa23b04ed34d49 100755 (executable)
--- a/jenkins-scripts/system_type.sh
+++ b/jenkins-scripts/system_type.sh
@@ -15,11 +15,10 @@ SYSTEM_TYPE=''
 
 IFS=','
 for i in "autorelease,autorelease" \
-         "builder,builder" \
+         "java-builder,builder" \
          "devstack,devstack" \
          "docker,docker" \
          "gbp-trusty,ubuntu-docker-ovs" \
-         "java,controller" \
          "matrix,matrix" \
          "robot,robot" \
          "ubuntu-trusty-mininet,mininet-ubuntu"