Clean up install of JJB and add instrumentation

Change-Id: I73fcfe0335a7d95beef1570919929e05226adfa6
Issue-ID: INT-146
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

5 files changed, 11 insertions, 9 deletions

diff --git a/bootstrap/jenkins/vagrant/Vagrantfile b/bootstrap/jenkins/vagrant/Vagrantfile
index 02b3ec18c..7dcb48eff 100644
--- a/bootstrap/jenkins/vagrant/Vagrantfile
+++ b/bootstrap/jenkins/vagrant/Vagrantfile
@@ -49,6 +49,7 @@ Vagrant.configure(2) do |config|
   #
   #   # Customize the amount of memory on the VM:
     vb.memory = "8192"
+    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
   end
   #
   # View the documentation for the provider you are using for more
diff --git a/bootstrap/jenkins/vagrant/bootstrap.sh b/bootstrap/jenkins/vagrant/bootstrap.sh
index fd0caf5c6..25c6a45f6 100755
--- a/bootstrap/jenkins/vagrant/bootstrap.sh
+++ b/bootstrap/jenkins/vagrant/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright 2017 Huawei Technologies Co., Ltd.
 #
@@ -39,16 +39,16 @@ apt-get update
 apt-get -y install git
 git config --global user.email "jenkins@localhost"
 git config --global user.name "jenkins"
-apt-get -y install curl openjdk-8-jdk maven unzip
+apt-get -y install curl openjdk-8-jdk-headless maven unzip python-pip
 
 # install Jenkins
 wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | sudo apt-key add -
 sh -c 'echo deb http://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list'
 apt-get update
-apt-get -y install jenkins jenkins-job-builder python-pip
+apt-get -y install jenkins
 
+# install docker
 apt-get -y install docker.io
-sudo usermod -aG docker ubuntu
 sudo usermod -aG docker jenkins
 
 su -l jenkins -c "/vagrant/jenkins-init-1.sh"
diff --git a/bootstrap/jenkins/vagrant/jenkins-init-1.sh b/bootstrap/jenkins/vagrant/jenkins-init-1.sh
index 1f0a80859..3e83fa118 100755
--- a/bootstrap/jenkins/vagrant/jenkins-init-1.sh
+++ b/bootstrap/jenkins/vagrant/jenkins-init-1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright 2017 Huawei Technologies Co., Ltd.
 #
diff --git a/bootstrap/jenkins/vagrant/jenkins-init-2.sh b/bootstrap/jenkins/vagrant/jenkins-init-2.sh
index a6cddbb10..f255a10ad 100755
--- a/bootstrap/jenkins/vagrant/jenkins-init-2.sh
+++ b/bootstrap/jenkins/vagrant/jenkins-init-2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright 2017 Huawei Technologies Co., Ltd.
 #
diff --git a/bootstrap/jenkins/vagrant/jjb-init.sh b/bootstrap/jenkins/vagrant/jjb-init.sh
index e9adeb63b..10b96b4fa 100755
--- a/bootstrap/jenkins/vagrant/jjb-init.sh
+++ b/bootstrap/jenkins/vagrant/jjb-init.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright 2017 Huawei Technologies Co., Ltd.
 #
@@ -17,9 +17,10 @@ git commit -m 'Installed plugins, restarted Jenkins' > /dev/null
 mkdir -p ~/.config/jenkins_jobs
 cp /vagrant/jenkins_jobs.ini ~/.config/jenkins_jobs
 
-pip install --user jenkins-job-builder
+pip -v install --user jenkins-job-builder
+pip list
 
-jenkins-job-builder update -r /vagrant/jjb
+jenkins-jobs update -r /vagrant/jjb
 
 cat > .gitignore <<EOF
 jobs/*/builds