build_inf_prepare_jenkins: fix for lighttpd config

[pti/rtp.git] / scripts / build_inf_centos / build_inf_prepare_jenkins.sh

diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
index 4f6c9ce..dc71a93 100755 (executable)
--- a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
+++ b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
@@ -201,7 +201,7 @@ export GOPATH="/usr/local/go"
 export PATH="${GOPATH}/bin:${PATH}"
 sudo yum install -y golang
 sudo mkdir -p ${GOPATH}/bin
-curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sudo sh
+curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sudo -E sh
 
 # pip installs
 # Install required python modules globally; versions are in the constraints file.
@@ -217,21 +217,14 @@ sudo pip install -c ${TOOLS_DIR}/toCOPY/builder-constraints.txt \
     junitxml \
     testtools
 
-# Create a sane py27 virtualenv
-virtualenv /opt/py27 && \
-    source /opt/py27/bin/activate && \
-    sudo pip install -c ${TOOLS_DIR}/toCOPY/builder-opt-py27-constraints.txt \
-            tox \
-        && \
-    for prog in tox ; do \
-        ln -s /opt/py27/bin/$prog /usr/bin ; \
-    done
+
 
 # Inherited  tools for mock stuff
 # we at least need the mock_cache_unlock tool
 # they install into /usr/bin
-sudo cp -rf ${TOOLS_DIR}/toCOPY/mock_overlay /opt/mock_overlay
-cd /opt/mock_overlay
+mkdir -p ${WORKSPACE}/opt
+cp -rf ${TOOLS_DIR}/toCOPY/mock_overlay ${WORKSPACE}/opt/mock_overlay
+cd ${WORKSPACE}/opt/mock_overlay
 make
 sudo make install
 
@@ -252,9 +245,10 @@ sudo mkdir -p /www/run
 sudo mkdir -p /www/logs
 sudo mkdir -p /www/home
 sudo mkdir -p /www/root/htdocs/localdisk
+sudo mkdir -p /www/root/htdocs/$(dirname ${WORKSPACE})
 sudo ln -s ${LOCALDISK}/loadbuild /www/root/htdocs/localdisk/loadbuild
-sudo ln -s ${MIRROR_DIR}/CentOS /www/root/htdocs/CentOS
 sudo ln -s ${LOCALDISK}/designer /www/root/htdocs/localdisk/designer
+sudo ln -s ${MIRROR_DIR}/CentOS /www/root/htdocs/CentOS
 sudo ln -s ${WORKSPACE} /www/root/htdocs/${WORKSPACE}
 
 # lighthttpd setup
@@ -274,7 +268,6 @@ sudo sed -i -e 's%^var\.log_root.*$%var.log_root = "/www/logs"%g' \
     -e "s/server.bind/#server.bind/g" \
     -e "s/server.document-root/#server.document-root/g" \
     -e "s/server.dirlisting/#server.dirlisting/g" \
-    -e "s/dir-listing.activate/#dir-listing.activate/g" \
     /etc/lighttpd/lighttpd.conf
 
 echo "server.port = 8088" | sudo tee -a /etc/lighttpd/lighttpd.conf 
@@ -283,6 +276,10 @@ echo "server.username = \"$USER\"" | sudo tee -a /etc/lighttpd/lighttpd.conf
 echo "server.groupname = \"$BUILD_GROUP\"" | sudo tee -a /etc/lighttpd/lighttpd.conf 
 echo "server.bind = \"localhost\"" | sudo tee -a /etc/lighttpd/lighttpd.conf 
 echo "server.document-root   = \"/www/root/htdocs\"" | sudo tee -a /etc/lighttpd/lighttpd.conf 
+
+sudo sed -i "s/dir-listing.activate/#dir-listing.activate/g" \
+    /etc/lighttpd/conf.d/dirlisting.conf
+
 echo "dir-listing.activate = \"enable\"" | sudo tee -a /etc/lighttpd/conf.d/dirlisting.conf
 
 sudo /usr/sbin/lighttpd  -f /etc/lighttpd/lighttpd.conf
@@ -303,4 +300,10 @@ sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY*
 # Try to continue a yum command even if a StarlingX repo is unavailable.
 sudo yum-config-manager --setopt=StarlingX\*.skip_if_unavailable=1 --save
 
+# Create a sane py27 virtualenv
+virtualenv ${WORKSPACE}/opt/py27
+source ${WORKSPACE}/opt/py27/bin/activate
+pip install -c ${TOOLS_DIR}/toCOPY/builder-opt-py27-constraints.txt tox
+sudo ln -s ${WORKSPACE}/opt/py27/bin/tox /usr/bin
+
 echo_step_end