Commit ba2ad877 authored by Ricardo Araujo's avatar Ricardo Araujo
Browse files

Merge branch 'feature/4339' into 'master'

Add configuration for stable/newton and ocata

See merge request !13
parents 14ab0a40 3ab8ec57
......@@ -227,7 +227,15 @@
export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK={build-ramdisk}
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
export TEMPEST_CONCURRENCY=1
export OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,placement-api,placement-client,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-svc,neutron,rabbit,s-account,s-container,s-object,s-proxy,ironic,ir-api,ir-cond,tempest
export OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-svc,neutron,rabbit,s-account,s-container,s-object,s-proxy,ironic,ir-api,ir-cond,tempest
if [ "$ZUUL_BRANCH" == "master" ] ; then
export OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
elif [ "$ZUUL_BRANCH" == "stable/ocata" ] ; then
export OVERRIDE_ENABLED_SERVICES+=,n-cell,placement-api,placement-client
fi
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
......@@ -267,7 +275,7 @@
sudo chown root:root /etc/pip.conf
sudo chmod 0644 /etc/pip.conf
set -x
# Tells devstack that we're going to use real hardware
if [ "{ironic-is-hardware}" == "1" ] ; then
# Deploy to hardware platform
......@@ -307,7 +315,7 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORK_GATEWAY={ironic-net-prefix}.1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"FIXED_RANGE={ironic-net-prefix}.0/24"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SUBNETPOOL_PREFIX_V4={ironic-net-prefix}.0/24"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PROVIDER_NETWORK_TYPE=\"flat\""
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PROVIDER_NETWORK_TYPE=flat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=private"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=br-ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
......@@ -318,13 +326,24 @@
# Note, The initial version of 2017 is required to manually open the ports in the security group
if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"REQUIREMENTS_BRANCH=refs/changes/27/454927/1"
sudo iptables -I INPUT -p udp --dport 69 -j ACCEPT || true
sudo iptables -I INPUT -p tcp --dport 3928 -j ACCEPT || true
sudo iptables -I INPUT -p tcp --dport 6385 -j ACCEPT || true
sudo iptables -I INPUT -p tcp --dport 8080 -j ACCEPT || true
sudo iptables -I INPUT -p tcp --dport 9999 -j ACCEPT || true
sudo iptables -I INPUT -p tcp --dport 3260 -j ACCEPT || true
fi
else
# The IPA ramdisk needs at least 1GB of RAM to run
export DEVSTACK_LOCAL_CONFIG="IRONIC_VM_SPECS_RAM={bm-vm-ram}"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT={bm-vm-count}"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"FIXED_RANGE={ironic-net-prefix}.0/24"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SUBNETPOOL_PREFIX_V4={ironic-net-prefix}.0/24"
if [ "$ZUUl_BRANCH" != "master" ] ; then
if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"REQUIREMENTS_BRANCH=refs/changes/27/454927/1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORK_GATEWAY={ironic-net-prefix}.1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
fi
......@@ -364,7 +383,6 @@
fi
# OneView section
sudo pip install python-oneviewclient
echo would export ONEVIEW_MANAGER_URL=https://x.x.x.x
echo would export ONEVIEW_USERNAME=xxxxxx
echo would export ONEVIEW_PASSWORD=xxxxxx
......@@ -374,6 +392,7 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS+=,{deploy_driver}"
function pre_test_hook {{
sudo pip install python-oneviewclient
local localconf=$BASE/new/devstack/local.conf
echo "[[post-config|/\$IRONIC_CONF_FILE]]" >> $localconf
echo "[oneview]" >> $localconf
......@@ -404,6 +423,18 @@
echo "deploywait_timeout=1200" >> $localconf
echo "power_timeout=120" >> $localconf
echo "unprovision_timeout=1200" >> $localconf
if [ "{run-custom-power-and-management-tests}" == "0" ] ; then
# [ricardoas] - 27/04/2017 - temporary hack for https://bugs.launchpad.net/ironic/+bug/1685924
if [[ "$ZUUL_BRANCH" == "master" ]] ; then
sudo apt-get update && sudo apt-get install -y qemu-kvm libvirt-bin
fi
git clone https://git.lsd.ufcg.edu.br/ironicdrivers/oneview-integration-tests.git ~/oneview-integration-tests
cd ~/oneview-integration-tests
bash prepare_test_clean.sh
cd -
fi
}}
export -f pre_test_hook
......@@ -414,11 +445,6 @@
bash post_test_hook.sh
}}
export -f post_test_hook
else
git clone https://git.lsd.ufcg.edu.br/ironicdrivers/oneview-integration-tests.git ~/oneview-integration-tests
cd ~/oneview-integration-tests
bash prepare_test_clean.sh
cd -
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment