Update tests

Author: Keqiu Hu

hadoop-plugin-test/expectedJobs/jobs1/jobs1_job25.job

@@ -4,9 +4,9 @@ dependencies=jobs1_job24
 conf.key1=value1
 conf.key2=value2
 conf.spark.driver.cores=1
-driver-memory=2048m
+driver-memory=2g
 execution-jar=path/to/python/script.py
 executor-cores=2
-executor-memory=8192m
+executor-memory=8g
 num-executors=6
 queue=marathon

hadoop-plugin-test/src/main/gradle/positive/jobs1.gradle

@@ -383,12 +383,12 @@ hadoop {
 
     tensorFlowJob('job24', 'tony') {
       executes 'path/to/python/script.py'
-      amMemory 2g
+      amMemory '2g'
       amCores 1
       amGpus 1
-      psMemory 2g
+      psMemory '2g'
       psCores 1
-      workerMemory 8g
+      workerMemory '8g'
       workerCores 1
       workerGpus 2
       numPs 2
@@ -403,13 +403,13 @@ hadoop {
 
     tensorFlowJob('job25', 'spark') {
       executes 'path/to/python/script.py'
-      amMemory 2g
+      amMemory '2g'
       amCores 1
       // Put ps memory before worker memory and ps cores after worker cores
       // to verify only worker params take effect
-      psMemory 2g
+      psMemory '2g'
       workerCores 2
-      workerMemory 8g
+      workerMemory '8g'
       psCores 1
       numPs 2
       numWorkers 4

hadoop-plugin/src/main/groovy/com/linkedin/gradle/hadoopdsl/job/TensorFlowSparkJob.groovy

@@ -22,11 +22,11 @@ package com.linkedin.gradle.hadoopdsl.job
  *   tensorFlowJob('jobName', 'spark') {
  *     executes path/to/python/script.py
  *     appParams params
- *     amMemory 2g
+ *     amMemory '2g'
  *     amCores 1
- *     psMemory 2g
+ *     psMemory '2g'
  *     psCores 1
- *     workerMemory 8g
+ *     workerMemory '8g'
  *     workerCores 1
  *     numPs 2
  *     numWorkers 4

hadoop-plugin/src/main/groovy/com/linkedin/gradle/hadoopdsl/job/TensorFlowTonyJob.groovy

@@ -204,7 +204,7 @@ class TensorFlowTonyJob extends HadoopJavaProcessJob implements TensorFlowJob {
       parsedMem = parsedMem[0..-2];
     }
     if (parsedMem[-1] == "g") {
-      parsedMem = parsedMem[0..-2] + "000";
+      parsedMem = (parsedMem[0..-2].toInteger() * 1024).toString();
     }
     return parsedMem;
   }