summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-03-25 05:04:38 +0000
committerLinda Wang <wangwulin@huawei.com>2017-03-25 06:12:22 +0000
commit00e5ce2316317c2b29a7608eee8d95e73eee2dba (patch)
tree91974c6bd4b48dbfbfa092ce574ee118e591c05b /docker
parentd48e87aa768d193efac2677169265dce16c5fdac (diff)
Fix Dockerfile.aarch64
Bugfix for error: https://build.opnfv.org/ci/view/functest/job/functest-docker-build-arm-push-master/99/console Change-Id: I04b45c05d4bb48c9b5b55050addce707177abcd4 Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.aarch648
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 60f72a297..17bf00027 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -114,16 +114,16 @@ RUN cd ${RELENG_MODULE_DIR} \
RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
-not -path "*tests/unit*" \
-not -path "*functest_venv*" \
- |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 &&
- find ${FUNCTEST_REPO_DIR} -name "*.sh" \
+ |xargs grep -L __main__ |cut -d\: -f 1 |xargs chmod -c 644 \
+ && find ${FUNCTEST_REPO_DIR} -name "*.sh" \
-not -path "*functest_venv*" \
|xargs grep -L \#\! |cut -d\: -f 1 |xargs chmod -c 644
RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
-not -path "*tests/unit*" \
-not -path "*functest_venv*" \
- |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 &&
- find ${FUNCTEST_REPO_DIR} -name "*.sh" \
+ |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
+ && find ${FUNCTEST_REPO_DIR} -name "*.sh" \
-not -path "*functest_venv*" \
|xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755