Merge branch 'itn-test-failures' into bq-aggns

Author: sanjanasandeep

integration-test-remote/src/test/java/io/cdap/cdap/app/etl/gcp/DataprocETLTestBase.java

@@ -162,6 +162,7 @@ private void createProfile(String profileName) throws Exception {
     properties.add(ofProperty("stackdriverLoggingEnabled", "true"));
     properties.add(ofProperty("stackdriverMonitoringEnabled", "true"));
     properties.add(ofProperty("idleTTL", "60"));
+    properties.add(ofProperty("imageVersion", "2.0.25-debian10"));
 
     JsonObject provisioner = new JsonObject();
     provisioner.addProperty("name", "gcp-dataproc");

integration-test-remote/src/test/java/io/cdap/cdap/app/etl/gcp/GoogleBigQuerySQLEngineTest.java

@@ -65,6 +65,7 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.GenericRecordBuilder;
 import org.apache.avro.io.DatumReader;
+import org.apache.parquet.Strings;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -179,6 +180,7 @@ public void testSQLEngineJoinSpark() throws Exception {
     testSQLEngineJoin(Engine.SPARK, true);
   }
 
+
   @Category({
           RequiresSpark.class
   })
@@ -307,6 +309,9 @@ private void testSQLEngineDeduplicate(Engine engine, boolean useConnection) thro
     Assert.assertEquals(expected, readOutput(serviceManager, DEDUPLICATE_SINK, DedupAggregatorTest.USER_SCHEMA));
   }
 
+    return new ImmutableMap.Builder<String, String>().putAll(props).build();
+  }
+
   private void testSQLEngineJoin(Engine engine, boolean useConnection) throws Exception {
     String filmDatasetName = "film-sqlenginejoinertest";
     String filmCategoryDatasetName = "film-category-sqlenginejoinertest";