From 22e0daf05b758ae037fe46c39b82d61b1a5d39a5 Mon Sep 17 00:00:00 2001 From: xiaodongwang Date: Wed, 28 Jan 2015 16:42:54 -0800 Subject: [PATCH] add multi oses regtests. Change-Id: I2d1649bd693c5c9146c5fb0eae33435e85b9660c --- regtest/regtest.conf | 2 +- regtest/regtest10.conf | 5 ++--- regtest/regtest11.conf | 15 +++++++++++++++ regtest/regtest12.conf | 15 +++++++++++++++ regtest/regtest13.conf | 14 ++++++++++++++ regtest/regtest7.conf | 4 ++-- regtest/regtest8.conf | 4 ++-- regtest/regtest9.conf | 5 ++--- 8 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 regtest/regtest11.conf create mode 100644 regtest/regtest12.conf create mode 100644 regtest/regtest13.conf diff --git a/regtest/regtest.conf b/regtest/regtest.conf index c22b2b7d..0816b947 100644 --- a/regtest/regtest.conf +++ b/regtest/regtest.conf @@ -18,7 +18,7 @@ export USE_POLL_SWITCHES=${USE_POLL_SWITCHES:-false} export LANGUAGE=${LANGUAGE:-'EN'} export TIMEZONE=${TIMEZONE:-'America/Los_Angeles'} export HOSTNAMES=${HOSTNAMES:-'allinone'} -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)centos.*'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)centos-6\.5.*'} export ADAPTER_NAME=${ADAPTER_NAME:=''} export ADAPTER_TARGET_SYSTEM_PATTERN=${ADAPTER_TARGET_SYSTEM_PATTERN:-'^openstack$'} export ADAPTER_FLAVOR_PATTERN=${ADAPTER_FLAVOR_PATTERN:-'allinone'} diff --git a/regtest/regtest10.conf b/regtest/regtest10.conf index afce5d3d..7e9313ce 100644 --- a/regtest/regtest10.conf +++ b/regtest/regtest10.conf @@ -4,7 +4,6 @@ export VIRT_CPUS=${VIRT_CPUS:-'2'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'20G'} export CLUSTER_NAME=${CLUSTER_NAME:-'multinodes'} -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} export HOSTNAMES=${HOSTNAMES:-'database,messaging,identity,compute-controller,compute-worker1,compute-worker2,network-server,network-worker,block-storage-volume,block-storage-controller,image,dashboard'} export HOST_ROLES=${HOST_ROLES:-'database=os-ops-database;messaging=os-ops-messaging;identity=os-identity;compute-controller=os-compute-controller;network-server=os-network-server;network-worker=os-network-worker;block-storage-volume=os-block-storage-volume;block-storage-controller=os-block-storage-controller;image=os-image;dashboard=os-dashboard'} export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} @@ -13,6 +12,6 @@ export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.90'} export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.90'} export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.90'} + export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source ${REGTEST_DIR}/regtest.conf -export LOCAL_REPO_URL='' +source ${REGTEST_DIR}/regtest8.conf diff --git a/regtest/regtest11.conf b/regtest/regtest11.conf new file mode 100644 index 00000000..489c7b35 --- /dev/null +++ b/regtest/regtest11.conf @@ -0,0 +1,15 @@ +# conf to run 1 instance with single-contoller-multi-compute flavor +export VIRT_NUM=${VIRT_NUM:-'1'} +export VIRT_CPUS=${VIRT_CPUS:-'10'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'30G'} +export CLUSTER_NAME=${CLUSTER_NAME:-'allinone-centos66'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)centos-6\.6.*'} +export HOSTNAMES=${HOSTNAMES:-'allinone'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 3'`.92} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.92'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.92'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.92'} + +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest.conf diff --git a/regtest/regtest12.conf b/regtest/regtest12.conf new file mode 100644 index 00000000..9f3e50f5 --- /dev/null +++ b/regtest/regtest12.conf @@ -0,0 +1,15 @@ +# conf to run 1 instance with single-contoller-multi-compute flavor +export VIRT_NUM=${VIRT_NUM:-'1'} +export VIRT_CPUS=${VIRT_CPUS:-'10'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'30G'} +export CLUSTER_NAME=${CLUSTER_NAME:-'allinone-centos70'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)centos-7\.0.*'} +export HOSTNAMES=${HOSTNAMES:-'allinone'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 3'`.94} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.94'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.94'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.94'} + +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest.conf diff --git a/regtest/regtest13.conf b/regtest/regtest13.conf new file mode 100644 index 00000000..1a76446e --- /dev/null +++ b/regtest/regtest13.conf @@ -0,0 +1,14 @@ +# conf to run openstack 2 intsances with single-contoller-multi-compute flavor +export VIRT_NUM=${VIRT_NUM:-'1'} +export VIRT_CPUS=${VIRT_CPUS:-'10'} +export VIRT_MEM=${VIRT_MEM:-'8192'} +export VIRT_DISK=${VIRT_DISK:-'30G'} +export CLUSTER_NAME=${CLUSTER_NAME:-'allinone-ubuntu1404'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04.*'} +export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 3'`.96} +export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.96'} +export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.96'} +export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.96'} + +export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source ${REGTEST_DIR}/regtest8.conf diff --git a/regtest/regtest7.conf b/regtest/regtest7.conf index 43b25ab4..3bab7c58 100644 --- a/regtest/regtest7.conf +++ b/regtest/regtest7.conf @@ -4,11 +4,11 @@ export VIRT_CPUS=${VIRT_CPUS:-'10'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} export HOSTNAMES=${HOSTNAMES:-'ubuntu'} -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-12\.04.*'} export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 3'`.82} export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.82'} export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.82'} export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.82'} + export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest6.conf -export LOCAL_REPO_URL='' diff --git a/regtest/regtest8.conf b/regtest/regtest8.conf index 0aaa3c7d..aa3f92c3 100644 --- a/regtest/regtest8.conf +++ b/regtest/regtest8.conf @@ -4,11 +4,11 @@ export VIRT_CPUS=${VIRT_CPUS:-'10'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} export CLUSTER_NAME=${CLUSTER_NAME:-'allinone'} -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} +export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-12\.04.*'} export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 3'`.84} export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.84'} export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.84'} export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.84'} + export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) source ${REGTEST_DIR}/regtest.conf -export LOCAL_REPO_URL='' diff --git a/regtest/regtest9.conf b/regtest/regtest9.conf index eba78881..a58f2ead 100644 --- a/regtest/regtest9.conf +++ b/regtest/regtest9.conf @@ -4,7 +4,6 @@ export VIRT_CPUS=${VIRT_CPUS:-'4'} export VIRT_MEM=${VIRT_MEM:-'8192'} export VIRT_DISK=${VIRT_DISK:-'30G'} export CLUSTER_NAME=${CLUSTER_NAME:-'single-controller'} -export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'} export HOSTNAMES=${HOSTNAMES:-'controller,network,compute'} export HOST_ROLES=${HOST_ROLES:-'controller=os-controller;network=os-network,os-block-storage-volume'} export DEFAULT_ROLES=${DEFAULT_ROLES:-'os-compute-worker'} @@ -13,6 +12,6 @@ export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.86'} export PUBLIC_IP_START=${PUBLIC_IP_START:-'172.16.3.86'} export STORAGE_IP_START=${STORAGE_IP_START:-'172.16.4.86'} + export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -source ${REGTEST_DIR}/regtest.conf -export LOCAL_REPO_URL='' +source ${REGTEST_DIR}/regtest8.conf