summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <ollivier.cedric@gmail.com>2017-03-22 08:53:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-22 08:53:23 +0000
commit7cf1acd21aa2f21c0cc4f8b0f6ac60404edc5f15 (patch)
tree14d3f0bed2385480a3a8ad27be865ee8aac90c8d
parent2426e4f43aa7bc69ea8e1b9052d724ca7b57ade7 (diff)
parent5a011b40ff772271a6f7055ce8005ea6c9f331a0 (diff)
Merge changes from topics '644', 'improve_unix_permission_check'
* changes: Change execute bits Improve unix permissions fixes
-rw-r--r--docker/Dockerfile16
-rw-r--r--docker/Dockerfile.aarch6416
-rw-r--r--[-rwxr-xr-x]functest/ci/__init__.py0
-rw-r--r--[-rwxr-xr-x]functest/ci/tier_builder.py0
-rw-r--r--[-rwxr-xr-x]functest/ci/tier_handler.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/features/copper.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/features/doctor.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/features/domino.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/features/promise.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/features/sdnvpn.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/features/security_scan.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/mano/orchestra.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/openstack/healthcheck/healthcheck.sh0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/vnf/router/__init__.py0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/vnf/router/vyos_vrouter.py0
-rw-r--r--[-rwxr-xr-x]functest/utils/functest_logger.py0
-rw-r--r--[-rwxr-xr-x]functest/utils/openstack_utils.py0
17 files changed, 28 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 30c31dad3..176c109e8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -120,8 +120,20 @@ RUN cd ${REPOS_DIR}/barometer \
&& pip install .
RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
- -not -path "*tests/unit*" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
- && find ${FUNCTEST_REPO_DIR} -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
+ -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" \
+ -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" \
+ -not -path "*functest_venv*" \
+ |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
RUN ${REPOS_DIR}/rally/install_rally.sh --yes
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 15f0bdc3a..60f72a297 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -112,8 +112,20 @@ RUN cd ${RELENG_MODULE_DIR} \
&& pip install -e .
RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
- -not -path "*tests/unit*" |xargs grep __main__ |cut -d\: -f 1 |xargs chmod -c 755 \
- && find ${FUNCTEST_REPO_DIR} -name "*.sh" |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
+ -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" \
+ -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" \
+ -not -path "*functest_venv*" \
+ |xargs grep \#\! |cut -d\: -f 1 |xargs chmod -c 755
RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
RUN ${REPOS_DIR}/rally/install_rally.sh --yes
diff --git a/functest/ci/__init__.py b/functest/ci/__init__.py
index e69de29bb..e69de29bb 100755..100644
--- a/functest/ci/__init__.py
+++ b/functest/ci/__init__.py
diff --git a/functest/ci/tier_builder.py b/functest/ci/tier_builder.py
index f4c6f70fd..f4c6f70fd 100755..100644
--- a/functest/ci/tier_builder.py
+++ b/functest/ci/tier_builder.py
diff --git a/functest/ci/tier_handler.py b/functest/ci/tier_handler.py
index 6b4864b5b..6b4864b5b 100755..100644
--- a/functest/ci/tier_handler.py
+++ b/functest/ci/tier_handler.py
diff --git a/functest/opnfv_tests/features/copper.py b/functest/opnfv_tests/features/copper.py
index 735b315d2..735b315d2 100755..100644
--- a/functest/opnfv_tests/features/copper.py
+++ b/functest/opnfv_tests/features/copper.py
diff --git a/functest/opnfv_tests/features/doctor.py b/functest/opnfv_tests/features/doctor.py
index 4d295a674..4d295a674 100755..100644
--- a/functest/opnfv_tests/features/doctor.py
+++ b/functest/opnfv_tests/features/doctor.py
diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py
index b36220fa0..b36220fa0 100755..100644
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
diff --git a/functest/opnfv_tests/features/promise.py b/functest/opnfv_tests/features/promise.py
index 15636fbfe..15636fbfe 100755..100644
--- a/functest/opnfv_tests/features/promise.py
+++ b/functest/opnfv_tests/features/promise.py
diff --git a/functest/opnfv_tests/features/sdnvpn.py b/functest/opnfv_tests/features/sdnvpn.py
index 1919a03c2..1919a03c2 100755..100644
--- a/functest/opnfv_tests/features/sdnvpn.py
+++ b/functest/opnfv_tests/features/sdnvpn.py
diff --git a/functest/opnfv_tests/features/security_scan.py b/functest/opnfv_tests/features/security_scan.py
index 58f0ec748..58f0ec748 100755..100644
--- a/functest/opnfv_tests/features/security_scan.py
+++ b/functest/opnfv_tests/features/security_scan.py
diff --git a/functest/opnfv_tests/mano/orchestra.py b/functest/opnfv_tests/mano/orchestra.py
index fd5e40d05..fd5e40d05 100755..100644
--- a/functest/opnfv_tests/mano/orchestra.py
+++ b/functest/opnfv_tests/mano/orchestra.py
diff --git a/functest/opnfv_tests/openstack/healthcheck/healthcheck.sh b/functest/opnfv_tests/openstack/healthcheck/healthcheck.sh
index 7fa957c01..7fa957c01 100755..100644
--- a/functest/opnfv_tests/openstack/healthcheck/healthcheck.sh
+++ b/functest/opnfv_tests/openstack/healthcheck/healthcheck.sh
diff --git a/functest/opnfv_tests/vnf/router/__init__.py b/functest/opnfv_tests/vnf/router/__init__.py
index e69de29bb..e69de29bb 100755..100644
--- a/functest/opnfv_tests/vnf/router/__init__.py
+++ b/functest/opnfv_tests/vnf/router/__init__.py
diff --git a/functest/opnfv_tests/vnf/router/vyos_vrouter.py b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
index 94a3ecfd8..94a3ecfd8 100755..100644
--- a/functest/opnfv_tests/vnf/router/vyos_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/vyos_vrouter.py
diff --git a/functest/utils/functest_logger.py b/functest/utils/functest_logger.py
index 022211cb7..022211cb7 100755..100644
--- a/functest/utils/functest_logger.py
+++ b/functest/utils/functest_logger.py
diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index e33af63b4..e33af63b4 100755..100644
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py