closes #16

docker/tester/pull-repo.sh

@@ -33,14 +33,9 @@ then
   rm -rf "${cloneDir}"
 fi
 
-printf "Cloning $( echo "${repoUrl}" | sed 's/\(.*:\/\/\).*@\(.*\)/\1\2/' ).\n"
 git clone "${repoUrl}" "${cloneDir}"
 cd "${cloneDir}"
 
-printf "Tracking branch:\n"
-git branch -vv
-
-
 # If a commit SHA is specified then detach the HEAD and point at the commit
 if [[ -n "${commit}" ]]
 then

docker/tester/run-test-container.sh

@@ -29,12 +29,14 @@ set -o nounset  # exit if undeclared variable is used
 githubApiKey=${1}
 team=${2}
 projectCommit=${3}
-testImage=${4}
-tempDir=${5}
+projectBranch=${4}
+testImage=${5}
+tempDir=${6}
 
 docker run --cap-add=NET_ADMIN \
            --env PROJECT_URL=https://${githubApiKey}@github.com/CS310-2017Jan/cpsc310project_${team}.git \
            --env PROJECT_COMMIT=$projectCommit \
+           --env PROJECT_BRANCH=$projectBranch \
            --volume "${tempDir}":/output/ \
            --rm \
            ${testImage}

docker/tester/run-tests.sh

@@ -23,7 +23,7 @@
 #  1) Expects the deliverable repo exist in deliverableDir with up to date packages (node_modules)
 # ##############################################################################
 
-version=1.0.1
+version=1.0.2
 
 
 projectDir="/cpsc310project"
@@ -38,15 +38,21 @@ testsCmd="yarn run autotest"
 
 date=$(date --utc +%FT%T.%3NZ)
 
-printf "<INFO>\n%s\n%s\n</INFO exitcode=0, completed=%s, duration=0s>\n\n\n" "script version: ${version}" "test suite version: ${TESTSUITE_VERSION}" "${date}"
+printf "<INFO>\nproject url: %s\nbranch: %s\ncommit: %s\nscript version: %s\ntest suite version: %s\n</INFO exitcode=0, completed=%s, duration=0s>\n\n\n" \
+  "$( echo "${PROJECT_URL}" | sed 's/\(.*:\/\/\).*@\(.*\)/\1\2/' )" \
+  "${PROJECT_BRANCH}" \
+  "${PROJECT_COMMIT}" \
+  "${version}" \
+  "${TESTSUITE_VERSION}" \
+  "${date}"
 
 
 # Clone the specified student repo into the projectDir
 # Exit if unable to clone the student's repo
 printf "<PROJECT_PULL>\n"
 
 startTime=$(date +%s)
-./pull-repo.sh $@ "${projectDir}" 2>&1
+./pull-repo.sh "${PROJECT_URL}" "${PROJECT_COMMIT}" "${projectDir}" 2>&1
 status=$?
 duration=$(($(date +%s) - $startTime))
 date=$(date --utc +%FT%T.%3NZ)

src/model/results/TestRecord.ts

@@ -102,6 +102,7 @@ export default class TestRecord implements DatabaseRecord {
       this.githubToken,
       this.team,
       this.commit,
+      this.ref,
       this.deliverable.image,
       tempDir.path
     ];
@@ -241,12 +242,12 @@ export default class TestRecord implements DatabaseRecord {
 
   public processInfoTag(stdout: string): any {
     try {
-      let infoTagRegex: RegExp = /^<INFO>\nscript version: (.+)\ntest suite version: (.+)\n<\/INFO exitcode=(\d+), completed=(.+), duration=(\d+)s>$/gm
+      let infoTagRegex: RegExp = /^<INFO>\nproject url: (.+)\nbranch: (.+)\ncommit: (.+)\nscript version: (.+)\ntest suite version: (.+)\n<\/INFO exitcode=(\d+), completed=(.+), duration=(\d+)s>$/gm
       //let infoMsgRegex: RegExp = /^(npm.*)$/gm;
       let matches: string[] = infoTagRegex.exec(stdout);
       let processed: any = {
-        scriptVersion: matches[1].trim(),
-        suiteVersion: matches[2].trim()
+        scriptVersion: matches[4].trim(),
+        suiteVersion: matches[5].trim()
       };
       return processed;
     } catch (err) {