Commit 632b1a0f authored by Ricardo Araujo's avatar Ricardo Araujo
Browse files

Merge branch 'feature/5169' into 'master'

Updates of ci-project-config

See merge request !16
parents ff9e17a0 250fc044
......@@ -216,6 +216,8 @@
DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack/ironic-python-agent $DEVSTACK_GATE_PROJECTS_OVERRIDE"
DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack/tempest $DEVSTACK_GATE_PROJECTS_OVERRIDE"
sudo apt-get install -y libffi-dev libssl-dev
export DEVSTACK_GATE_PROJECTS_OVERRIDE
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST={run_tempest}
......@@ -228,10 +230,10 @@
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
export TEMPEST_CONCURRENCY=1
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
export OVERRIDE_ENABLED_SERVICES=dstat,g-api,g-reg,key,mysql,n-api,n-api-meta,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,n-api-meta
if [ "$ZUUL_BRANCH" == "master" ] || [ "$ZUUL_BRANCH" == "stable/pike" ] ; 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
......@@ -265,6 +267,7 @@
PIP_MIRROR_CONF="\
[global]
timeout = 200
index-url = https://pypi.python.org/simple
extra-index-url = http://10.11.4.24:3141/root/pypi/+simple
[install]
......@@ -353,7 +356,7 @@
if [ "$DEPLOY_WITH_IPA" == "1" ] ; then
export IRONIC_RAMDISK_TYPE={ramdisk-type}
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=$IRONIC_RAMDISK_TYPE"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IPA_DOWNLOAD_BRANCH=$(echo $ZUUL_BRANCH| sed 's/\//-/g')"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IPA_DOWNLOAD_BRANCH=$(echo $ZUUL_BRANCH| sed 's/\//-/g')"
fi
export IPXE_ENABLED={ipxe-enabled}
if [ "$IPXE_ENABLED" == "1" ] ; then
......@@ -423,19 +426,20 @@
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
if [ "1" == "1" ] ; then
git clone -b feature/hponeview https://git.lsd.ufcg.edu.br/ironicdrivers/oneview-integration-tests-utils ~/oneview-integration-tests-utils
cd ~/oneview-integration-tests-utils
bash prepare_test_clean.sh
cd -
fi
}}
}
export -f pre_test_hook
if [ "{run-custom-power-and-management-tests}" == "1" ] ; then
......
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