jketreno/intel-media-ffmpeg
1
0
Fork 0
Code Issues Activity

Fixed .gitlab-ci.yml and scripts/test-image.sh to correctly mount data volume

Browse Source 
Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2020-01-29 13:54:01 -08:00
parent 2861b457ac
commit 7a1c3fb247
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -17,8 +17,6 @@ variables:
TAG: "${CI_PIPELINE_IID}-${CI_COMMIT_REF_NAME}-${OS_DISTRO}-${PACKAGE_STREAM}" TAG: "${CI_PIPELINE_IID}-${CI_COMMIT_REF_NAME}-${OS_DISTRO}-${PACKAGE_STREAM}"
build_image: build_image:
before_script:
- git clean -fdx
stage: "build" stage: "build"
script: script:
- ./scripts/build-dockerfile.sh - ./scripts/build-dockerfile.sh
@ -31,8 +29,6 @@ build_image:
- triggers - triggers
test_image: test_image:
before_script:
- git clean -fdx
stage: "test" stage: "test"
script: script:
- ./scripts/test-image.sh - ./scripts/test-image.sh
@ -42,8 +38,6 @@ test_image:
- triggers - triggers
publish_image: publish_image:
before_script:
- git clean -fdx
stage: "publish" stage: "publish"
script: script:
- ./scripts/promote-image.sh - ./scripts/promote-image.sh

3
assets/commands/test
View File

@ -98,9 +98,6 @@ EOF
exit 2 exit 2
} }
echo "Checking contents of /data. It should be empty:"
ls -altr /data
[ ! -e "/data/AUD_MW_E.264" ] && { [ ! -e "/data/AUD_MW_E.264" ] && {
cat << EOF cat << EOF

2
scripts/test-image.sh
View File

@ -41,7 +41,7 @@ CMD="docker run \
${ADD_GROUPS} \ ${ADD_GROUPS} \
--rm \ --rm \
--device=/dev/dri \ --device=/dev/dri \
-v data:/data \ -v '$(pwd)/data:/data' \
${REGISTRY_URL}/${CONTAINER}:${TAG} \ ${REGISTRY_URL}/${CONTAINER}:${TAG} \
test" test"