From 743a610bf387c7888b704872e189b6b372c5730a Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Mon, 9 Jan 2017 17:24:01 +0100 Subject: [PATCH] Use ubuntu image for tempest scenarios from Neutron Tempest scenarios in Neutron tree contain tests from trunk plugin. These tests require instances with 802.1q capabilities in order to test VLAN traffic through subports. The patch adds hook to fetch Ubuntu image for tests running from Neutron tree. There are only few other tests in the tree so using bigger image won't make the job running that much longer in the gate. As ubuntu boot time takes longer, it's expected that it will take longer time until instance becomes available over SSH. Change-Id: I867595b0e90d23f56101835f9a524a2b0d00bb5a --- neutron/tests/contrib/gate_hook.sh | 1 + neutron/tests/contrib/hooks/ubuntu_image | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 neutron/tests/contrib/hooks/ubuntu_image diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index c18828216c7..b127cf8fedc 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -82,6 +82,7 @@ case $VENV in load_conf_hook osprofiler if [[ "$VENV" =~ "dsvm-scenario" ]]; then load_conf_hook iptables_verify + load_rc_hook ubuntu_image fi if [[ "$VENV" =~ "pecan" ]]; then load_conf_hook pecan diff --git a/neutron/tests/contrib/hooks/ubuntu_image b/neutron/tests/contrib/hooks/ubuntu_image new file mode 100644 index 00000000000..e48a26aba1d --- /dev/null +++ b/neutron/tests/contrib/hooks/ubuntu_image @@ -0,0 +1,5 @@ +DOWNLOAD_DEFAULT_IMAGES=False +IMAGE_URLS="http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img," +DEFAULT_INSTANCE_TYPE="ds1G" +DEFAULT_INSTANCE_USER="ubuntu" +BUILD_TIMEOUT=392