ODPI-131 - Remove requirement for hdfs, yarn, mapred binaries to be i… (#70)

* ODPI-131 - Remove requirement for hdfs, yarn, mapred binaries to be in /usr/lib/hadoop/bin, and don't worry if extra binaries are in /usr/lib/hadoop/bin.

* ODPI-131 - Two fixes:

1) Make all HADOOP_JARCONTENT_* and HADOOP_BINCONTENT_* only check for files missing and not be concerned with additional files.
2) Fix the reference build to add /usr/lib/hadoop/bin/yarn, /usr/lib/hadoop/bin/mapred, /usr/lib/hadoop/bin/hdfs

Also reverts earlier change to hadoop-common-bin.list.

* Fixed test names to match spec markers.

* Change from duplicating the wrapper code to making a symlink.

* Clean up

* Revert to earlier functionality

* Revert changes

(cherry picked from commit 84c38382d7fee5f79902770509a2ca494130d2c7)

2 files changed, 12 insertions, 15 deletions

diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
index b32f5a2b..ab6cd511 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
@@ -1,5 +1,2 @@
 rcc
 hadoop
-hdfs
-yarn
-mapred
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy b/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
index 54e08b59..f5521c5d 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
+++ b/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
@@ -218,7 +218,7 @@ specs {
     }
     'HADOOP_BINCONTENT_COMMON' {
       name = 'HADOOP_BINCONTENT_COMMON'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'hadoop envvars'
         baseDirEnv = 'HADOOP_COMMON_HOME'
@@ -228,7 +228,7 @@ specs {
     }
     'HADOOP_BINCONTENT_HDFS' {
       name = 'HADOOP_BINCONTENT_HDFS'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'hdfs envvars'
         baseDirEnv = 'HADOOP_HDFS_HOME'
@@ -238,7 +238,7 @@ specs {
     }
     'HADOOP_BINCONTENT_MAPRED' {
       name = 'HADOOP_BINCONTENT_MAPRED'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'mapred envvars'
         baseDirEnv = 'HADOOP_MAPRED_HOME'
@@ -248,7 +248,7 @@ specs {
     }
     'HADOOP_BINCONTENT_YARN' {
       name = 'HADOOP_BINCONTENT_YARN'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'yarn envvars'
         baseDirEnv = 'HADOOP_YARN_HOME'
@@ -256,9 +256,9 @@ specs {
         referenceList = 'hadoop-yarn-bin.list'
       }
     }
-    'HADOOP_JARCONTENT_COMMON' {
+    'HADOOP_LIBJARSCONTENT_COMMON' {
       name = 'HADOOP_JARCONTENT_COMMON'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'hadoop envvars'
         baseDirEnv = 'HADOOP_COMMON_HOME'
@@ -266,9 +266,9 @@ specs {
         referenceList = 'hadoop-common-jar.list'
       }
     }
-    'HADOOP_JARCONTENT_HDFS' {
+    'HADOOP_LIBJARSCONTENT_HDFS' {
       name = 'HADOOP_JARCONTENT_HDFS'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'hdfs envvars'
         baseDirEnv = 'HADOOP_HDFS_HOME'
@@ -276,9 +276,9 @@ specs {
         referenceList = 'hadoop-hdfs-jar.list'
       }
     }
-    'HADOOP_JARCONTENT_MAPRED' {
+    'HADOOP_LIBJARSCONTENT_MAPRED' {
       name = 'HADOOP_JARCONTENT_MAPRED'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'mapred envvars'
         baseDirEnv = 'HADOOP_MAPRED_HOME'
@@ -286,9 +286,9 @@ specs {
         referenceList = 'hadoop-mapreduce-jar.list'
       }
     }
-    'HADOOP_JARCONTENT_YARN' {
+    'HADOOP_LIBJARSCONTENT_YARN' {
       name = 'HADOOP_JARCONTENT_YARN'
-      type = 'dircontent'
+      type = 'dirstruct'
       arguments {
         envcmd = 'yarn envvars'
         baseDirEnv = 'HADOOP_YARN_HOME'