BIGTOP-2704. Include ODPi runtime tests option into the battery of smoke tests

38 files changed, 2 insertions, 69 deletions

diff --git a/bigtop-tests/spec-tests/README.md b/bigtop-tests/smoke-tests/odpi-runtime/README.md
index 8fde997f..8fde997f 100644
--- a/bigtop-tests/spec-tests/README.md
+++ b/bigtop-tests/smoke-tests/odpi-runtime/README.md
diff --git a/bigtop-tests/spec-tests/runtime/build.gradle b/bigtop-tests/smoke-tests/odpi-runtime/build.gradle
index 97e36353..97e36353 100644
--- a/bigtop-tests/spec-tests/runtime/build.gradle
+++ b/bigtop-tests/smoke-tests/odpi-runtime/build.gradle
diff --git a/bigtop-tests/spec-tests/runtime/src/main/java/org/odpi/specs/runtime/hadoop/ApiExaminer.java b/bigtop-tests/smoke-tests/odpi-runtime/src/main/java/org/odpi/specs/runtime/hadoop/ApiExaminer.java
index d95c010d..d95c010d 100644
--- a/bigtop-tests/spec-tests/runtime/src/main/java/org/odpi/specs/runtime/hadoop/ApiExaminer.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/main/java/org/odpi/specs/runtime/hadoop/ApiExaminer.java
diff --git a/bigtop-tests/spec-tests/runtime/src/main/java/org/odpi/specs/runtime/hive/HCatalogMR.java b/bigtop-tests/smoke-tests/odpi-runtime/src/main/java/org/odpi/specs/runtime/hive/HCatalogMR.java
index 4110d5d6..4110d5d6 100644
--- a/bigtop-tests/spec-tests/runtime/src/main/java/org/odpi/specs/runtime/hive/HCatalogMR.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/main/java/org/odpi/specs/runtime/hive/HCatalogMR.java
diff --git a/bigtop-tests/spec-tests/runtime/src/main/resources/api-examiner-prep.sh b/bigtop-tests/smoke-tests/odpi-runtime/src/main/resources/api-examiner-prep.sh
index 8c9ab5e6..8c9ab5e6 100755
--- a/bigtop-tests/spec-tests/runtime/src/main/resources/api-examiner-prep.sh
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/main/resources/api-examiner-prep.sh
diff --git a/bigtop-tests/spec-tests/runtime/src/test/groovy/org/odpi/specs/runtime/TestSpecsRuntime.groovy b/bigtop-tests/smoke-tests/odpi-runtime/src/test/groovy/org/odpi/specs/runtime/TestSpecsRuntime.groovy
index bc2a3b20..bc2a3b20 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/groovy/org/odpi/specs/runtime/TestSpecsRuntime.groovy
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/groovy/org/odpi/specs/runtime/TestSpecsRuntime.groovy
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/HiveHelper.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/HiveHelper.java
index 3e56224b..3e56224b 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/HiveHelper.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/HiveHelper.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/JdbcConnector.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/JdbcConnector.java
index 7512dabf..7512dabf 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/JdbcConnector.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/JdbcConnector.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestBeeline.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestBeeline.java
index 578621aa..578621aa 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestBeeline.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestBeeline.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestCLI.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestCLI.java
index 2b70909e..2b70909e 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestCLI.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestCLI.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestHCatalog.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestHCatalog.java
index 0ea49ce8..0ea49ce8 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestHCatalog.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestHCatalog.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestJdbc.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestJdbc.java
index 154fd9cd..154fd9cd 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestJdbc.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestJdbc.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestSql.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestSql.java
index f2478412..f2478412 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestSql.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestSql.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestThrift.java b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestThrift.java
index 8e0abda4..8e0abda4 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/java/org/odpi/specs/runtime/hive/TestThrift.java
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/java/org/odpi/specs/runtime/hive/TestThrift.java
diff --git a/bigtop-tests/spec-tests/runtime/src/test/python/find-public-apis.py b/bigtop-tests/smoke-tests/odpi-runtime/src/test/python/find-public-apis.py
index 091c496e..091c496e 100755
--- a/bigtop-tests/spec-tests/runtime/src/test/python/find-public-apis.py
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/python/find-public-apis.py
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-2.7.3-api-report.json b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common-2.7.3-api-report.json
index 6a6c7af7..6a6c7af7 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-2.7.3-api-report.json
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common-2.7.3-api-report.json
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common-bin.list
index ab6cd511..ab6cd511 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-bin.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common-bin.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common-jar.list
index 2edbd0f9..2edbd0f9 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common-jar.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common.list
index 73ff182a..73ff182a 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-common.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-2.7.3-api-report.json b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs-2.7.3-api-report.json
index b5e22655..b5e22655 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-2.7.3-api-report.json
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs-2.7.3-api-report.json
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-bin.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs-bin.list
index 88879870..88879870 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-bin.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs-bin.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs-jar.list
index 8355c581..8355c581 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs-jar.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs.list
index 12565fd2..12565fd2 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-hdfs.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-bin.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce-bin.list
index 0a7a9c57..0a7a9c57 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-bin.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce-bin.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-client-core-2.7.3-api-report.json b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce-client-core-2.7.3-api-report.json
index 6061c5ea..6061c5ea 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-client-core-2.7.3-api-report.json
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce-client-core-2.7.3-api-report.json
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce-jar.list
index 03167870..03167870 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce-jar.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce.list
index cc06d808..cc06d808 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-mapreduce.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-subprojs.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-subprojs.list
index b0a5654d..b0a5654d 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-subprojs.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-subprojs.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-api-2.7.3-api-report.json b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-api-2.7.3-api-report.json
index 6ad5f180..6ad5f180 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-api-2.7.3-api-report.json
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-api-2.7.3-api-report.json
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-bin.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-bin.list
index d3861b97..d3861b97 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-bin.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-bin.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-client-2.7.3-api-report.json b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-client-2.7.3-api-report.json
index f62ee8ed..f62ee8ed 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-client-2.7.3-api-report.json
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-client-2.7.3-api-report.json
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-common-2.7.3-api-report.json b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-common-2.7.3-api-report.json
index b394bff9..b394bff9 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-common-2.7.3-api-report.json
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-common-2.7.3-api-report.json
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-jar.list
index 26613d4e..26613d4e 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn-jar.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn.list b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn.list
index bb880052..bb880052 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn.list
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/hadoop-yarn.list
diff --git a/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/testRuntimeSpecConf.groovy
index 339de4cb..339de4cb 100644
--- a/bigtop-tests/spec-tests/runtime/src/test/resources/testRuntimeSpecConf.groovy
+++ b/bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/testRuntimeSpecConf.groovy
diff --git a/bigtop-tests/spec-tests/build.gradle b/bigtop-tests/spec-tests/build.gradle
deleted file mode 100644
index b0a67150..00000000
--- a/bigtop-tests/spec-tests/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-subprojects {
-  /**
-   *  Utility function for tests to use to confirm EVN Variables.
-   */
-  ext.checkEnv = { env_vars ->
-    env_vars.each() {
-      def value = System.getenv("${it}")
-      if (value == null || value == "null")
-        throw new GradleException("undeclared env variable: ${it}")
-    }
-  }
-
-  ext.groovyVersion = '1.8.0'
-  ext.hadoopVersion = '2.6.0'
-  // itest needs be greater than or equal to = 1.0.0
-  ext.itestVersion = '1.0.0' // Might need to be able to read an input for alternate version?
-  ext.BIGTOP_HOME   = rootDir
-
-  dependencies {
-    compile group: 'org.apache.bigtop.itest', name: 'itest-common', version: itestVersion, transitive: 'true'
-    //needed to avoid groovy not on classpath error.
-    testCompile group: 'org.codehaus.groovy', name: 'groovy', version: groovyVersion
-    testRuntime project(':bigtop-tests:smoke-tests:logger-test-config')
-  }
-
-  test.doFirst {
-    // TestHadoopExamples and other tests rely on BIGTOP_HOME environment
-    // variable to find some resources. Let's set it up, using ext.BIGTOP_HOME
-    environment ("BIGTOP_HOME", BIGTOP_HOME)
-  }
-
-  test << {
-    println("Now testing...");
-    //todo, add back in 'basic' after BIGTOP-1392 .
-    testLogging {
-      events "passed", "skipped", "failed"
-    }
-  }
-
-  // Let's make sure all system Properties are passed into the forked test JVM
-  tasks.withType(Test) {
-    systemProperties = System.getProperties()
-  }
-  test.dependsOn compileGroovy
-  compileGroovy.dependsOn clean
-}
diff --git a/build.gradle b/build.gradle
index 101ecc74..b0a83b15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,6 +80,8 @@ rat {
        "bigtop-tests/smoke-tests/phoenix/*.sql",
        "bigtop-tests/smoke-tests/ignite-hadoop/*.data",
        "bigtop-tests/smoke-tests/tajo/table1/*.csv",
+       "bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/*.json",
+       "bigtop-tests/smoke-tests/odpi-runtime/src/test/resources/*.list",
        "**/target/**",
        "**/build/**",
        "**/.gradle/**",
@@ -427,7 +429,6 @@ task "bigtop-slaves"(type:Exec,
 
 project.afterEvaluate {
   checkClusterTestProjects("smoke.tests")
-  checkClusterTestProjects("spec.tests")
   artifactToInstall(dependsOn: [installTopLevel, installCommon, installConf, installiTest])
 }
 
diff --git a/settings.gradle b/settings.gradle
index 7ae4bf57..ac071f1b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,9 +31,4 @@ fTree.each() { buildFile ->
   def parent = buildFile.getParentFile().name
   include("bigtop-tests:smoke-tests:$parent")
 }
-fTree = fileTree(dir: 'bigtop-tests/spec-tests', include: '*/build.gradle')
-fTree.each() { buildFile ->
-  def parent = buildFile.getParentFile().name
-  include("bigtop-tests:spec-tests:$parent")
-}