Browse Source

Merge "Download octavia image in tests"

changes/60/568960/1
Zuul 4 years ago committed by Gerrit Code Review
parent
commit
a4e93c412a
  1. 1
      .zuul.yaml
  2. 3
      playbooks/devstack/functional/run.yaml
  3. 6
      playbooks/get_amphora_tarball.yaml

1
.zuul.yaml

@ -27,6 +27,7 @@
- ^heat/locale/.*$
- ^heat/tests/.*$
- ^releasenotes/.*$
pre-run: playbooks/get_amphora_tarball.yaml
vars:
disable_convergence: 'false'
sql: mysql

3
playbooks/devstack/functional/run.yaml

@ -65,6 +65,9 @@
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial"
# enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it
services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
export PROJECTS="openstack/barbican $PROJECTS"

6
playbooks/get_amphora_tarball.yaml

@ -0,0 +1,6 @@
- hosts: primary
tasks:
- name: Download amphora tarball
get_url:
url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
Loading…
Cancel
Save