Merge branch 'master' into invalid-argument

Author: pervazea

Jenkinsfile

@@ -141,35 +141,35 @@ pipeline {
                 //     }
                 // }
 
-                stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
-                    agent { docker { image 'fedora:27' } }
-                    steps {
-                        sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
-                        sh 'python ./script/validators/source_validator.py'
-                        sh 'mkdir build'
-                        sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
-                        sh 'cd build && make check -j4'
-                        sh 'cd build && make install'
-                        sh 'cd build && bash ../script/testing/psql/psql_test.sh'
-                        sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
-                        sh 'cd build && python ../script/validators/jdbc_validator.py'
-                    }
-                }
+                // stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
+                //     agent { docker { image 'fedora:27' } }
+                //     steps {
+                //         sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
+                //         sh 'python ./script/validators/source_validator.py'
+                //         sh 'mkdir build'
+                //         sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
+                //         sh 'cd build && make check -j4'
+                //         sh 'cd build && make install'
+                //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
+                //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                //     }
+                // }
 
-                stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
-                    agent { docker { image 'fedora:27' } }
-                    steps {
-                        sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
-                        sh 'python ./script/validators/source_validator.py'
-                        sh 'mkdir build'
-                        sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
-                        sh 'cd build && make check -j4'
-                        sh 'cd build && make install'
-                        sh 'cd build && bash ../script/testing/psql/psql_test.sh'
-                        sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
-                        sh 'cd build && python ../script/validators/jdbc_validator.py'
-                    }
-                }
+                // stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
+                //     agent { docker { image 'fedora:27' } }
+                //     steps {
+                //         sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
+                //         sh 'python ./script/validators/source_validator.py'
+                //         sh 'mkdir build'
+                //         sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
+                //         sh 'cd build && make check -j4'
+                //         sh 'cd build && make install'
+                //         sh 'cd build && bash ../script/testing/psql/psql_test.sh'
+                //         sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
+                //         sh 'cd build && python ../script/validators/jdbc_validator.py'
+                //     }
+                // }
 
                 // stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
                 //     agent { docker { image 'centos:7' } }

script/installation/packages.sh

@@ -55,14 +55,13 @@ function install_protobuf3.4.0() {
     echo "Only Ubuntu and Fedora is supported currently!"
     return 0
  fi
- CWD=`pwd`
- cd $TMPDIR
  wget -O protobuf-cpp-3.4.0.tar.gz https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
  tar -xzf protobuf-cpp-3.4.0.tar.gz
  cd protobuf-3.4.0
  ./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig
- # Do cleanup
- cd $CWD
+ cd ..
+ # Cleanup
+ rm -rf protobuf-3.4.0 protobuf-cpp-3.4.0.tar.gz
 }
 
 # Utility function for installing tensorflow components of python/C++
@@ -72,14 +71,16 @@ function install_tf() {
  LinkerConfigCmd=$3
  TARGET_DIRECTORY="/usr/local"
  # Install Tensorflow Python Binary
- sudo pip3 install --upgrade ${TFBinaryURL}
+ sudo -E pip3 install --upgrade ${TFBinaryURL}
 
  # Install C-API
  TFCApiURL="https://storage.googleapis.com/tensorflow/libtensorflow/${TFCApiFile}"
  wget -O $TFCApiFile $TFCApiURL
- sudo tar -C $TARGET_DIRECTORY -xzf $TFCApiFile
+ sudo tar -C $TARGET_DIRECTORY -xzf $TFCApiFile || true
  # Configure the Linker
  eval $LinkerConfigCmd
+ # Cleanup
+ rm -rf ${TFCApiFile}
 }
 
 ## ------------------------------------------------
@@ -333,6 +334,7 @@ elif [ "$DISTRO" = "DARWIN" ]; then
     brew install [email protected]
     brew install postgresql
     brew install curl
+    brew install wget
     brew install python
     brew upgrade python
     # Brew installs correct version of Protobuf(3.5.1 >= 3.4.0)