From 7a1c3fb2476e9652dacc9467d37cef5c40958d97 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james.p.ketrenos@intel.com>
Date: Wed, 29 Jan 2020 13:54:01 -0800
Subject: [PATCH] Fixed .gitlab-ci.yml and scripts/test-image.sh to correctly
 mount data volume

Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
---
 .gitlab-ci.yml        | 6 ------
 assets/commands/test  | 3 ---
 scripts/test-image.sh | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0720f61..3a9574d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,6 @@ variables:
   TAG: "${CI_PIPELINE_IID}-${CI_COMMIT_REF_NAME}-${OS_DISTRO}-${PACKAGE_STREAM}"
 
 build_image:
-  before_script:
-  - git clean -fdx
   stage: "build"
   script:
   - ./scripts/build-dockerfile.sh 
@@ -31,8 +29,6 @@ build_image:
   - triggers
 
 test_image:
-  before_script:
-  - git clean -fdx
   stage: "test"
   script:
   - ./scripts/test-image.sh
@@ -42,8 +38,6 @@ test_image:
   - triggers
 
 publish_image:
-  before_script:
-  - git clean -fdx
   stage: "publish"
   script:
   - ./scripts/promote-image.sh
diff --git a/assets/commands/test b/assets/commands/test
index c6351ca..144105b 100755
--- a/assets/commands/test
+++ b/assets/commands/test
@@ -98,9 +98,6 @@ EOF
   exit 2
 }
 
-echo "Checking contents of /data. It should be empty:"
-ls -altr /data
-
 [ ! -e "/data/AUD_MW_E.264" ] && {
   cat << EOF
 
diff --git a/scripts/test-image.sh b/scripts/test-image.sh
index d168c7d..9d8ea10 100755
--- a/scripts/test-image.sh
+++ b/scripts/test-image.sh
@@ -41,7 +41,7 @@ CMD="docker run \
   ${ADD_GROUPS} \
   --rm \
   --device=/dev/dri \
-  -v data:/data \
+  -v '$(pwd)/data:/data' \
   ${REGISTRY_URL}/${CONTAINER}:${TAG} \
   test"