From 68f5cfb09a6fdd793450e551db19a24cde8c7c2f Mon Sep 17 00:00:00 2001
From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Fri, 16 Dec 2016 13:33:21 -0600
Subject: [PATCH] Revert "Add dependencies for tldk jjb"

This reverts commit 486588e7a8095791b81a4ac8bd0062e2297a61ee.

Reverting change because it's currently broken in production and will
block the Packer cut-over from Vagrant

Change-Id: I5e9da2ceeb6c79148ad1af18563cbf3ccb5a612d
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---
 jjb/tldk/gtest-build.sh       | 13 -------------
 jjb/tldk/include-raw-build.sh |  8 --------
 jjb/tldk/tldk.yaml            |  8 --------
 3 files changed, 29 deletions(-)
 delete mode 100644 jjb/tldk/gtest-build.sh

diff --git a/jjb/tldk/gtest-build.sh b/jjb/tldk/gtest-build.sh
deleted file mode 100644
index dc66908e7..000000000
--- a/jjb/tldk/gtest-build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# basic build script example
-set -e -o pipefail
-set -x
-echo $WORKSPACE
-git clone https://github.com/google/googletest.git $WORKSPACE/googletest
-cmake $WORKSPACE/googletest/CMakeLists.txt
-echo GTEST_DIR=$WORKSPACE/googletest/googletest > gtest-env.prop
-echo GMOCK_DIR=$WORKSPACE/googletest/googlemock >> gtest-env.prop
-
-echo "*******************************************************************"
-echo "* GTEST BUILD SUCCESSFULLY COMPLETED"
-echo "*******************************************************************"
diff --git a/jjb/tldk/include-raw-build.sh b/jjb/tldk/include-raw-build.sh
index 417a1deca..f4ba63b63 100644
--- a/jjb/tldk/include-raw-build.sh
+++ b/jjb/tldk/include-raw-build.sh
@@ -28,16 +28,8 @@ fi
 echo "sha1sum of this script: ${0}"
 sha1sum $0
 
-# Make TLDK
 make
 
 echo "*******************************************************************"
 echo "* TLDK BUILD SUCCESSFULLY COMPLETED"
 echo "*******************************************************************"
-
-# Run unit tests application
-$WORKSPACE/x86_64-native-linuxapp-gcc/app/gtest-rfc --lcores=0 -n 2
-
-echo "*******************************************************************"
-echo "* TLDK UNIT TESTS SUCCESSFUL
-echo "*******************************************************************"
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index eafc7e1d6..0a29baf73 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -108,10 +108,6 @@
                 notbuilt: true
 
     builders:
-        - shell:
-            !include-raw-escape: gtest-build.sh
-        - inject:
-            properties-file: gtest-env.prop
         - shell:
             !include-raw-escape: include-raw-build.sh
 
@@ -151,9 +147,5 @@
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: gtest-build.sh
-        - inject:
-            properties-file: gtest-env.prop
         - shell:
             !include-raw-escape: include-raw-build.sh
-- 
2.16.6