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

Merge branch 'stable/newton' into 'master'

Added configuration for run backport patch stable/newton.

See merge request !7
parents 9905f88c 122c5b27
......@@ -227,18 +227,18 @@
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,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,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 BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export IRONICCLIENT_FROM_SOURCE={client-from-source}
if [ "$IRONICCLIENT_FROM_SOURCE" == "1" ]; then
export DEVSTACK_PROJECT_FROM_GIT="python-ironicclient"
export DEVSTACK_PROJECT_FROM_GIT="python-ironicclient"
fi
export IRONIC_LIB_FROM_SOURCE={ironic-lib-from-source}
if [ "$IRONIC_LIB_FROM_SOURCE" == "1" ]; then
export DEVSTACK_PROJECT_FROM_GIT="ironic-lib"
export DEVSTACK_PROJECT_FROM_GIT="ironic-lib"
fi
export DEVSTACK_LOCAL_CONFIG=""
......@@ -259,11 +259,7 @@
export IRONIC_HWINFO_FILE=$(pwd)/{hwinfo-file}
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_HWINFO_FILE=$(pwd)/{hwinfo-file}"
# CoreOS image cache
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AGENT_KERNEL_URL=https://cloud.lsd.ufcg.edu.br:8080/swift/v1/ufcg-oneview-ci/coreos_production_pxe-master.vmlinuz"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AGENT_RAMDISK_URL=https://cloud.lsd.ufcg.edu.br:8080/swift/v1/ufcg-oneview-ci/coreos_production_pxe_image-oem-master.cpio.gz"
#Image settings for hardware platform
# Image settings for hardware platform
export DEVSTACK_LOCAL_CONFIG+=$'\n'"DOWNLOAD_DEFAULT_IMAGES=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IMAGE_URLS={url-prefix}/{user-image-file}"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE={user-image-is-whole-disk}"
......@@ -277,119 +273,128 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PUBLIC_INTERFACE=eth1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IP_VERSION=4"
## Neutron options
# Neutron options
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_USE_SECGROUP=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_USE_PROVIDER_NETWORKING=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_USE_PROVIDERNET_FOR_PUBLIC=False"
## Neutron Networking options used to create Neutron Subnets
export DEVSTACK_LOCAL_CONFIG+=$'\n'"FIXED_RANGE={ironic-net-prefix}.0/24"
# Neutron Networking options used to create Neutron Subnets
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORK_GATEWAY={ironic-net-prefix}.1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PROVIDER_NETWORK_TYPE=\"flat\""
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'"USE_SUBNETPOOL=False"
## Open vSwitch provider networking options
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'"Q_USE_PROVIDER_NETWORKING=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_USE_PROVIDERNET_FOR_PUBLIC=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
## TFTP config
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TFTPSERVER_IP={ironic-net-prefix}.254"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_HTTP_SERVER={ironic-net-prefix}.254"
# Note, The initial version of 2017 is required to manually open the ports in the security group
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
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NETWORK_GATEWAY={ironic-net-prefix}.1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"USE_SUBNETPOOL=False"
fi
fi
export DEPLOY_WITH_IPA={deploy-with-ipa}
if [ "$DEPLOY_WITH_IPA" == "1" ] ; then
export IRONIC_RAMDISK_TYPE={ramdisk-type}
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=$IRONIC_RAMDISK_TYPE"
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')"
fi
export IPXE_ENABLED={ipxe-enabled}
if [ "$IPXE_ENABLED" == "1" ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_IPXE_ENABLED=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_IPXE_ENABLED=True"
fi
# tempest plugin support was added in Mitaka.
if [ "$ZUUL_BRANCH" != "stable/kilo" -a "$ZUUL_BRANCH" != "stable/liberty" ] ; then
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
fi
# Allow switching between full tempest and baremetal-only
if [ "{gate-tempest-full}" == "1" ] ; then
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_TEMPEST_FULL=1
else
# The plugin name, and thus the regex we use, changed during the move to tempest-lib
# Remove this section when we drop support for liberty
if [ "$DEVSTACK_GATE_TEMPEST_ALL_PLUGINS" == "1" ] ; then
# for tempest-lib, tests are prefixed with "ironic"
export DEVSTACK_GATE_TEMPEST_REGEX=ironic
else
# for tempest itself, tests are prefixed with "baremetal"
export DEVSTACK_GATE_TEMPEST_REGEX=baremetal
fi
# The plugin name, and thus the regex we use, changed during the move to tempest-lib
# Remove this section when we drop support for liberty
if [ "$DEVSTACK_GATE_TEMPEST_ALL_PLUGINS" == "1" ] ; then
# for tempest-lib, tests are prefixed with "ironic"
export DEVSTACK_GATE_TEMPEST_REGEX=ironic
else
# for tempest itself, tests are prefixed with "baremetal"
export DEVSTACK_GATE_TEMPEST_REGEX=baremetal
fi
fi
# devstack plugin didn't exist until mitaka
if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
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
export ONEVIEW_ALLOW_INSECURE_CONNECTIONS=true
echo would export SERVER_PROFILE_TEMPLATE_URI="<spt_uri>"
echo would export SERVER_HARDWARE_URI="<sh_uri>"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS+=,{deploy_driver}"
function pre_test_hook {{
local localconf=$BASE/new/devstack/local.conf
echo "[[post-config|/\$IRONIC_CONF_FILE]]" >> $localconf
echo "[oneview]" >> $localconf
set +x
echo "manager_url=$ONEVIEW_MANAGER_URL" >> $localconf
echo "username=$ONEVIEW_USERNAME" >> $localconf
echo "password=$ONEVIEW_PASSWORD" >> $localconf
set -x
echo "manager_url=https://x.x.x.x"
echo "username=XXXXX"
echo "password=XXXXX"
echo "allow_insecure_connections=$ONEVIEW_ALLOW_INSECURE_CONNECTIONS" >> $localconf
echo "tls_cacert_file=" >> $localconf
echo "max_polling_attempts=100" >> $localconf
echo "[pxe]" >> $localconf
echo "pxe_append_params = nofb nomodeset vga=normal systemd.journald.forward_to_console=yes ipa-debug=1" >> $localconf
echo "[[post-extra|\$TEMPEST_CONFIG]]" >> $localconf
echo "[baremetal]" >> $localconf
echo "deploywait_timeout=1200" >> $localconf
echo "power_timeout=120" >> $localconf
echo "unprovision_timeout=1200" >> $localconf
local localconf=$BASE/new/devstack/local.conf
echo "[[post-config|/\$IRONIC_CONF_FILE]]" >> $localconf
echo "[oneview]" >> $localconf
set +x
if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then
sed -i -e '353d' $BASE/new/devstack/lib/neutron_plugins/services/l3
echo "line removed!"
fi
echo "manager_url=$ONEVIEW_MANAGER_URL" >> $localconf
echo "username=$ONEVIEW_USERNAME" >> $localconf
echo "password=$ONEVIEW_PASSWORD" >> $localconf
set -x
echo "manager_url=https://x.x.x.x"
echo "username=XXXXX"
echo "password=XXXXX"
echo "allow_insecure_connections=$ONEVIEW_ALLOW_INSECURE_CONNECTIONS" >> $localconf
echo "tls_cacert_file=" >> $localconf
echo "max_polling_attempts=100" >> $localconf
echo "[pxe]" >> $localconf
echo "pxe_append_params = nofb nomodeset vga=normal systemd.journald.forward_to_console=yes ipa-debug=1" >> $localconf
echo "[[test-config|\$TEMPEST_CONFIG]]" >> $localconf
echo "[baremetal]" >> $localconf
echo "deploywait_timeout=1200" >> $localconf
echo "power_timeout=120" >> $localconf
echo "unprovision_timeout=1200" >> $localconf
}}
export -f pre_test_hook
if [ "{run-custom-power-and-management-tests}" == "1" ] ; then
function post_test_hook {{
git clone https://git.lsd.ufcg.edu.br/ironicdrivers/oneview-integration-tests.git
cd oneview-integration-tests
bash post_test_hook.sh
}}
export -f post_test_hook
function post_test_hook {{
git clone https://git.lsd.ufcg.edu.br/ironicdrivers/oneview-integration-tests.git
cd oneview-integration-tests
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
git clone -b clean_server_profile https://git.lsd.ufcg.edu.br/ironicdrivers/oneview-integration-tests.git ~/oneview-integration-tests
cd ~/oneview-integration-tests
bash prepare_test_clean.sh
cd -
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-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