aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.sh19
-rw-r--r--docker/benchmarking/Dockerfile2
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile1
-rw-r--r--docker/smoke/Dockerfile2
-rw-r--r--docker/tempest/Dockerfile2
-rw-r--r--docker/vnf/Dockerfile2
-rw-r--r--functest/ci/config_aarch64_patch.yaml3
-rw-r--r--functest/ci/config_patch.yaml7
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py2
-rw-r--r--functest/opnfv_tests/openstack/shaker/shaker.py4
-rw-r--r--tox.ini2
12 files changed, 34 insertions, 14 deletions
diff --git a/build.sh b/build.sh
index 78bac6d39..a6110ac68 100644
--- a/build.sh
+++ b/build.sh
@@ -19,12 +19,14 @@ docker/smoke \
docker/benchmarking \
docker/features"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
-build_opts=(--pull=true --no-cache --force-rm=true)
+build_opts=("--pull=true" --no-cache "--force-rm=true")
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:iruya|${repo}/functest-core:amd64-iruya|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:amd64-iruya|g" {} +
+ -e \
+ "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:amd64-iruya|g" \
+ {} +
for dir in ${amd64_dirs}; do
(cd "${dir}" &&
docker build "${build_opts[@]}" \
@@ -33,7 +35,7 @@ for dir in ${amd64_dirs}; do
[ "${dir}" != "docker/core" ] &&
(docker rmi "${repo}/functest-${dir##**/}:amd64-iruya" || true)
done
-[ ! -z "${amd64_dirs}" ] &&
+[ -n "${amd64_dirs}" ] &&
(docker rmi "${repo}/functest-core:amd64-iruya" alpine:3.9 || true)
find . -name Dockerfile -exec git checkout {} +
@@ -42,7 +44,9 @@ find . -name Dockerfile -exec sed -i \
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:iruya|${repo}/functest-core:arm64-iruya|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm64-iruya|g" {} +
+ -e \
+ "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm64-iruya|g" \
+ {} +
for dir in ${arm64_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
-t "${repo}/functest-${dir##**/}:arm64-iruya" .)
@@ -50,7 +54,7 @@ for dir in ${arm64_dirs}; do
[ "${dir}" != "docker/core" ] &&
(docker rmi "${repo}/functest-${dir##**/}:arm64-iruya" || true)
done
-[ ! -z "${arm64_dirs}" ] &&
+[ -n "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-core:arm64-iruya" \
multiarch/alpine:arm64-v3.9 || true)
find . -name Dockerfile -exec git checkout {} +
@@ -60,7 +64,8 @@ find . -name Dockerfile -exec sed -i \
find . -name Dockerfile -exec sed -i \
-e "s|opnfv/functest-core:iruya|${repo}/functest-core:arm-iruya|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm-iruya|g" {} +
+ -e \
+ "s|opnfv/functest-tempest:iruya|${repo}/functest-tempest:arm-iruya|g" {} +
for dir in ${arm_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
-t "${repo}/functest-${dir##**/}:arm-iruya" .)
@@ -68,7 +73,7 @@ for dir in ${arm_dirs}; do
[ "${dir}" != "docker/core" ] &&
(docker rmi "${repo}/functest-${dir##**/}:arm-iruya" || true)
done
-[ ! -z "${arm_dirs}" ] &&
+[ -n "${arm_dirs}" ] &&
(docker rmi "${repo}/functest-core:arm-iruya" \
multiarch/alpine:armhf-v3.9 || true)
find . -name Dockerfile -exec git checkout {} +
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 53c3ad899..06659b40c 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
-ARG TEMPEST_TAG=23325c0ee8868324b1d4cd79ccbcb5026c7ed00a
+ARG TEMPEST_TAG=e8088d1218eba0b8e4ed59fa5ca30ac9b664b7fb
ARG VMTP_TAG=2.5.0
RUN apk --no-cache add --update libxml2 libxslt && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index c413d9846..5b2cdd8df 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
-ARG TEMPEST_TAG=23325c0ee8868324b1d4cd79ccbcb5026c7ed00a
+ARG TEMPEST_TAG=e8088d1218eba0b8e4ed59fa5ca30ac9b664b7fb
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update python3 sshpass && \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index d267089ca..02e51cfc0 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
+ARG TEMPEST_TAG=e8088d1218eba0b8e4ed59fa5ca30ac9b664b7fb
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
COPY thirdparty-requirements.txt thirdparty-requirements.txt
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 9afe54957..be27492f2 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-tempest:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
-ARG TEMPEST_TAG=23325c0ee8868324b1d4cd79ccbcb5026c7ed00a
+ARG TEMPEST_TAG=e8088d1218eba0b8e4ed59fa5ca30ac9b664b7fb
ARG REFSTACK_TARGET=2018.11
ARG PATROLE_TAG=0.5.0
ARG NEUTRON_TEMPEST_TAG=0.3.0
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile
index 9aeb7cb22..ddb0c4803 100644
--- a/docker/tempest/Dockerfile
+++ b/docker/tempest/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-core:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
-ARG TEMPEST_TAG=23325c0ee8868324b1d4cd79ccbcb5026c7ed00a
+ARG TEMPEST_TAG=e8088d1218eba0b8e4ed59fa5ca30ac9b664b7fb
ARG RALLY_TAG=1.4.1
ARG RALLY_OPENSTACK_TAG=90bd2c4c39deb449197993f9e42142c90c1b2f6d
ARG UJSON_TAG=d25e024f481c5571d15f3c0c406a498ca0467cfd
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 44da1e6fa..53ed7c9aa 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/functest-core:iruya
ARG BRANCH=stable/iruya
ARG OPENSTACK_TAG=stable/stein
-ARG TEMPEST_TAG=23325c0ee8868324b1d4cd79ccbcb5026c7ed00a
+ARG TEMPEST_TAG=e8088d1218eba0b8e4ed59fa5ca30ac9b664b7fb
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
ARG CLOUDIFY_VIMS_TAG=gambia
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml
index 2775fc8b9..c2164cd68 100644
--- a/functest/ci/config_aarch64_patch.yaml
+++ b/functest/ci/config_aarch64_patch.yaml
@@ -82,5 +82,8 @@ os:
rally_full:
image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+ rally_jobs:
+ image: /home/opnfv/functest/images/cirros-0.4.0-aarch64-disk.img
+
tempest:
use_custom_flavors: 'True'
diff --git a/functest/ci/config_patch.yaml b/functest/ci/config_patch.yaml
index 159be475e..7fe3f760d 100644
--- a/functest/ci/config_patch.yaml
+++ b/functest/ci/config_patch.yaml
@@ -46,6 +46,8 @@ fdio:
flavor_ram: 1024
rally_full:
flavor_ram: 1024
+ rally_jobs:
+ flavor_ram: 1024
ovs:
vmready1:
@@ -94,6 +96,8 @@ ovs:
flavor_ram: 1024
rally_full:
flavor_ram: 1024
+ rally_jobs:
+ flavor_ram: 1024
vio:
vmready1:
@@ -190,6 +194,9 @@ vio:
rally_full:
image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
image_format: vmdk
+ rally_jobs:
+ image: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.vmdk
+ image_format: vmdk
cloudify:
image:
/home/opnfv/functest/images/ubuntu-16.04-server-cloudimg-amd64-disk1.vmdk
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 61352c1ed..37b1488dd 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -431,7 +431,7 @@ class RallyBase(singlevm.VmReady2):
LOGGER.debug('task_id : %s', task_id)
if task_id is None:
LOGGER.error("Failed to retrieve task_id")
- LOGGER.error("Result:\n%s", output)
+ LOGGER.error("Result:\n%s", output.decode("utf-8"))
raise Exception("Failed to retrieve task id")
self._save_results(test_name, task_id)
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 1ee669ce3..fd31ea689 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -40,6 +40,7 @@ class Shaker(singlevm.SingleVm2):
ssh_connect_loops = 12
create_server_timeout = 300
shaker_timeout = '3600'
+ quota_instances = -1
def __init__(self, **kwargs):
super(Shaker, self).__init__(**kwargs)
@@ -82,6 +83,9 @@ class Shaker(singlevm.SingleVm2):
"heat_stack_owner", user=self.project.user.id,
project=self.project.project.id,
domain=self.project.domain.id)
+ self.orig_cloud.set_compute_quotas(
+ self.project.project.name,
+ instances=self.quota_instances)
scpc = scp.SCPClient(self.ssh.get_transport())
scpc.put('/home/opnfv/functest/conf/env_file', remote_path='~/')
if os.environ.get('OS_CACERT'):
diff --git a/tox.ini b/tox.ini
index 7d182a47f..222544503 100644
--- a/tox.ini
+++ b/tox.ini
@@ -73,7 +73,7 @@ files =
functest/ci/convert_images.sh
functest/ci/download_images.sh
build.sh
-commands = bashate {[testenv:bashate]files}
+commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files}
[testenv:bandit]