aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_functest.yaml1
-rw-r--r--ci/config_patch.yaml1
-rw-r--r--ci/testcases.yaml2
-rw-r--r--docker/Dockerfile1
-rwxr-xr-xtestcases/OpenStack/healthcheck/healthcheck.sh5
-rwxr-xr-xtestcases/OpenStack/tempest/gen_tempest_conf.py4
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py3
-rwxr-xr-xtestcases/features/sfc/set-up-tacker.sh6
8 files changed, 16 insertions, 7 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index 8e45b1d2..afa6ff1f 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -50,6 +50,7 @@ general:
healthcheck:
disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img
+ disk_format: qcow2
vping:
ping_timeout: 200
diff --git a/ci/config_patch.yaml b/ci/config_patch.yaml
index 467a83ca..4994d49d 100644
--- a/ci/config_patch.yaml
+++ b/ci/config_patch.yaml
@@ -7,3 +7,4 @@ lxd:
healthcheck:
disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-lxc.tar.gz
+ disk_format: raw \ No newline at end of file
diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 47d544b9..aec99714 100644
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -47,7 +47,7 @@ tiers:
2) Connectivity between 2 instances over a private network.
dependencies:
installer: ''
- scenario: ''
+ scenario: '^((?!lxd).)*$'
-
name: tempest_smoke_serial
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 57c10f3b..04ebf2c6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -64,6 +64,7 @@ RUN pip install --upgrade pip
RUN mkdir -p ${repos_dir}
RUN mkdir -p /home/opnfv/functest/results
+RUN mkdir -p /home/opnfv/functest/conf
RUN mkdir -p /root/.ssh
RUN chmod 700 /root/.ssh
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 2449ac93..996aadcf 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -120,6 +120,7 @@ info "...Keystone OK!"
info "Testing Glance API..."
#################################
disk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_image 2> /dev/null || true)
+disk_format=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_format 2> /dev/null || true)
kernel_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.kernel_image 2> /dev/null || true)
ramdisk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.ramdisk_image 2> /dev/null || true)
extra_properties=$(cat ${YAML_FILE} | shyaml get-value healthcheck.extra_properties 2> /dev/null || true)
@@ -151,10 +152,10 @@ fi
debug "image extra_properties=${extra_properties}"
-eval glance image-create --name ${image_1} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_1} --disk-format ${disk_format} --container-format bare \
${extra_opts} < ${disk_img}
debug "image '${image_1}' created."
-eval glance image-create --name ${image_2} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_2} --disk-format ${disk_format} --container-format bare \
${extra_opts} < ${disk_img}
debug "image '${image_2}' created."
info "... Glance OK!"
diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py
index 79236b95..4aa814a5 100755
--- a/testcases/OpenStack/tempest/gen_tempest_conf.py
+++ b/testcases/OpenStack/tempest/gen_tempest_conf.py
@@ -17,6 +17,7 @@ import shutil
import functest.utils.functest_utils as ft_utils
import functest.utils.functest_logger as ft_logger
from run_tempest import configure_tempest
+from run_tempest import TEMPEST_RESULTS_DIR
logger = ft_logger.Logger("multisite").getLogger()
@@ -112,6 +113,9 @@ def configure_tempest_multisite(deployment_dir):
def main():
+ if not os.path.exists(TEMPEST_RESULTS_DIR):
+ os.makedirs(TEMPEST_RESULTS_DIR)
+
deployment_dir = ft_utils.get_deployment_dir(logger)
configure_tempest_multisite(deployment_dir)
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 3a8d8d72..5925b584 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -422,7 +422,8 @@ def main():
deployment_dir = ft_utils.get_deployment_dir(logger)
- if "" != args.conf:
+ if "" == args.conf:
+ MODE = ""
configure_tempest(deployment_dir)
else:
MODE = " --tempest-config " + args.conf
diff --git a/testcases/features/sfc/set-up-tacker.sh b/testcases/features/sfc/set-up-tacker.sh
index 577b7d94..da2cb922 100755
--- a/testcases/features/sfc/set-up-tacker.sh
+++ b/testcases/features/sfc/set-up-tacker.sh
@@ -1,8 +1,8 @@
-curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=ddd4e11bb8bc62b7e8b06d4b44a308293c2c3362" > poc.tacker-up.sh
+git_commit=ee3046f24df0bfca7ee15501f6c06ad86dd462c2
+curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;\
+f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=${git_commit}" > poc.tacker-up.sh
bash poc.tacker-up.sh
-touch delete.sh
-
cat <<EOF > delete.sh
tacker sfc-classifier-delete red_http
tacker sfc-classifier-delete blue_ssh