Fixed more paths. Ensured params to CloudFormation are strings. Made …

…clear in doco that RIOS needs to be installed for AWS Batch scripts.

doc/source/awsbatch.rst

@@ -7,6 +7,8 @@ This directory contains an example of using RIOS with AWS Batch.
 Please ensure you understand the concepts used and the changes (and costs!)
 associated with these examples before you use them.
 
+The helper scripts below assume RIOS is installed on the machine you are using them on.
+
 Files
 -----
 

tools/awsbatch/Makefile

@@ -19,8 +19,8 @@ default: all
 # grab the current RIOS source tree and make it available to the 
 # docker COPY command
 dist:
-	cd ../../../..;python3 setup.py sdist --formats=gztar
-	cp ../../../../dist/rios-$(RIOS_VER).tar.gz .
+	cd ../..;python3 setup.py sdist --formats=gztar
+	cp ../../dist/rios-$(RIOS_VER).tar.gz .
 
 # Login to ECR, build package and push to ECR
 all: dist

tools/awsbatch/createbatch.py

@@ -89,13 +89,13 @@ def createBatch(stackname, region, ecrName, vCPUs, maxMem, maxJobs,
         addParam(params, 'ECR_Name', ecrName)
 
     if vCPUs is not None:
-        addParam(params, 'VCPUS', vCPUs)
+        addParam(params, 'VCPUS', str(vCPUs))
 
     if maxMem is not None:
-        addParam(params, 'MaxMemory', maxMem)
+        addParam(params, 'MaxMemory', str(maxMem))
 
     if maxJobs is not None:
-        addParam(params, 'MaxJobs', maxJobs)
+        addParam(params, 'MaxJobs', str(maxJobs))
 
     if instanceType is not None:
         addParam(params, 'InstanceType', instanceType)