openstack
/
project-config
Code Issues Proposed changes

Use local_conf for jenkins/jobs/n* 

Update to use newer local_conf stanza for projects where possible.

Change-Id: I5fca7640cef18362cd1ca6bfc736c3606b1bc93e
This commit is contained in:
Andreas Jaeger 2017-07-15 19:49:55 +02:00
parent e8655d3a9f
commit 1662be8582
16 changed files with 154 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jenkins/jobs/networking-bagpipe.yaml
View File

@ -13,6 +13,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-bagpipe git://git.openstack.org/openstack/networking-bagpipe
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -28,10 +32,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-bagpipe $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-bagpipe git://git.openstack.org/openstack/networking-bagpipe"
function gate_hook {{
bash -xe $BASE/new/networking-bagpipe/devstack/gate_hook.sh {which}
@ -62,6 +62,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-bagpipe git://git.openstack.org/openstack/networking-bagpipe
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -75,7 +79,6 @@
fi
export PROJECTS="openstack/networking-bagpipe $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-bagpipe git://git.openstack.org/openstack/networking-bagpipe"
function pre_test_hook {{
. $BASE/new/networking-bagpipe/devstack/pre_test_hook.sh fullstack

24
jenkins/jobs/networking-bgpvpn.yaml
View File

@ -15,6 +15,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-bgpvpn git://git.openstack.org/openstack/networking-bgpvpn
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -27,10 +31,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-bgpvpn $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-bgpvpn git://git.openstack.org/openstack/networking-bgpvpn"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -72,6 +72,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-bgpvpn git://git.openstack.org/openstack/networking-bgpvpn
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -85,10 +89,6 @@
# reference magic for testing changes.
export PROJECTS="openstack/networking-bgpvpn $PROJECTS"
export PROJECTS="openstack/networking-bagpipe $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-bgpvpn git://git.openstack.org/openstack/networking-bgpvpn"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -132,6 +132,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-bgpvpn git://git.openstack.org/openstack/networking-bgpvpn
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -147,10 +151,6 @@
# reference magic for testing changes.
export PROJECTS="openstack/networking-bgpvpn $PROJECTS"
export PROJECTS="openstack/networking-bagpipe $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-bgpvpn git://git.openstack.org/openstack/networking-bgpvpn"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

5
jenkins/jobs/networking-calico.yaml
View File

@ -13,6 +13,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-calico git://git.openstack.org/openstack/networking-calico
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -23,7 +27,6 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/networking-calico $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-calico git://git.openstack.org/openstack/networking-calico"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

22
jenkins/jobs/networking-generic-switch.yaml
View File

@ -11,6 +11,18 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-generic-switch git://git.openstack.org/openstack/networking-generic-switch
OVS_PHYSICAL_BRIDGE=brbm
PHYSICAL_NETWORK=mynetwork
Q_PLUGIN=ml2
ENABLE_TENANT_VLANS=True
Q_ML2_TENANT_NETWORK_TYPE=vlan
TENANT_VLAN_RANGE=100:150
# test with DLM support enabled
GENERIC_SWITCH_USER_MAX_SESSIONS=2
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -27,16 +39,6 @@
export PROJECTS="openstack/networking-generic-switch $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=brbm"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=mynetwork"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_TENANT_VLANS=True"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=vlan"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150"
# test with DLM support enabled
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GENERIC_SWITCH_USER_MAX_SESSIONS=2"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh

10
jenkins/jobs/networking-l2gw.yaml
View File

@ -13,6 +13,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-l2gw git://git.openstack.org/openstack/networking-l2gw
enable_service l2gw-plugin l2gw-agent
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -29,11 +34,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-l2gw $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-l2gw git://git.openstack.org/openstack/networking-l2gw"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service l2gw-plugin l2gw-agent"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

36
jenkins/jobs/networking-odl.yaml
View File

@ -13,6 +13,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -30,10 +34,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-odl $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -80,6 +80,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -92,9 +97,6 @@
export PROJECTS="openstack/networking-odl $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -173,6 +175,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -191,10 +197,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-odl $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -242,6 +244,13 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl
# Fullstack test cases now assumes ODL available at this IP
HOST_IP=127.0.0.1
UNSTACK_KEEP_ODL=True
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -259,11 +268,6 @@
export PROJECTS="openstack/networking-odl $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
# Fullstack test cases now assumes ODL available at this IP
export DEVSTACK_LOCAL_CONFIG+=$'\n'"HOST_IP=127.0.0.1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"UNSTACK_KEEP_ODL=True"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

8
jenkins/jobs/networking-onos.yaml
View File

@ -13,6 +13,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-onos git://git.openstack.org/openstack/networking-onos
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -30,10 +34,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-onos $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-onos git://git.openstack.org/openstack/networking-onos"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

32
jenkins/jobs/networking-ovn.yaml
View File

@ -64,6 +64,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -77,10 +81,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovn $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -185,6 +185,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -198,10 +202,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovn $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -305,6 +305,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -320,10 +324,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovn $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
export DEVSTACK_SUBNODE_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
# Keep localrc to be able to set some vars in pre_test_hook
@ -365,6 +365,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -377,9 +382,6 @@
export PROJECTS="openstack/networking-ovn $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovn git://git.openstack.org/openstack/networking-ovn"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-ovn/devstack/devstackgaterc
function post_test_hook {{

8
jenkins/jobs/networking-ovs-dpdk.yaml
View File

@ -13,6 +13,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-ovs-dpdk git://git.openstack.org/openstack/networking-ovs-dpdk
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -26,10 +30,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-ovs-dpdk $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-ovs-dpdk git://git.openstack.org/openstack/networking-ovs-dpdk"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

24
jenkins/jobs/networking-sfc.yaml
View File

@ -13,6 +13,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -29,10 +33,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-sfc $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -70,6 +70,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -87,10 +91,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-sfc $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
@ -138,6 +138,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -157,10 +161,6 @@
# our project repository. This makes zuul do the right
# reference magic for testing changes.
export PROJECTS="openstack/networking-sfc $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
# caches in nodepool, however make it a valid url for
# documentation purposes.
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc"
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1

5
jenkins/jobs/neutron-dynamic-routing.yaml
View File

@ -58,6 +58,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -74,7 +78,6 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing"
if [ "ZUUL_BRANCH" != "stable/newton" ]; then
function gate_hook {{

15
jenkins/jobs/neutron-fwaas.yaml
View File

@ -57,6 +57,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -69,7 +73,6 @@
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas"
function gate_hook {{
bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/gate_hook_tempest.sh {fwaas-version}
@ -105,6 +108,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -122,7 +129,6 @@
bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/gate_hook_tempest.sh $FWAAS_VERSION
}}
export DEVSTACK_GATE_TOPOLOGY="multinode"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas"
export -f gate_hook
@ -146,6 +152,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -167,7 +177,6 @@
export ENABLED_SERVICES="q-fwaas-v1"
fi
export DEVSTACK_GATE_TOPOLOGY="multinode"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas"
export -f gate_hook

8
jenkins/jobs/neutron-vpnaas.yaml
View File

@ -59,6 +59,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas
enable_plugin rally git://git.openstack.org/openstack/rally
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -71,9 +76,6 @@
export PROJECTS="openstack/neutron-vpnaas $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
function post_test_hook {{
$BASE/new/rally/tests/ci/rally-gate.sh
}}

23
jenkins/jobs/neutron.yaml
View File

@ -298,13 +298,17 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
IP_VERSION=6
SERVICE_IP_VERSION=6
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG="IP_VERSION=6"$'\n'"SERVICE_IP_VERSION=6"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -331,13 +335,16 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
SERVICE_IP_VERSION=6
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG="SERVICE_IP_VERSION=6"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -364,6 +371,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
Q_AGENT=linuxbridge
PHYSICAL_NETWORK=default
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -371,7 +383,6 @@
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TLSPROXY=1
export DEVSTACK_LOCAL_CONFIG="Q_AGENT=linuxbridge"$'\n'"PHYSICAL_NETWORK=default"$'\n'
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -398,6 +409,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
Q_AGENT=linuxbridge
PHYSICAL_NETWORK=default
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -405,7 +421,6 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_EXERCISES=0
export BRANCH_OVERRIDE={branch-override}
export DEVSTACK_LOCAL_CONFIG="Q_AGENT=linuxbridge"$'\n'"PHYSICAL_NETWORK=default"$'\n'
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi

24
jenkins/jobs/nova-lxd.yaml
View File

@ -11,6 +11,10 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin nova-lxd git://git.openstack.org/openstack/nova-lxd
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -21,10 +25,6 @@
export DEVSTACK_GATE_VIRT_DRIVER="lxd"
export PROJECTS="openstack/nova-lxd $PROJECTS"
# Enable nova-lxd devstack plugin. Provided repo should be
# cloned by zuul before devstack run and below provided
# link should not be used.
export DEVSTACK_LOCAL_CONFIG="enable_plugin nova-lxd git://git.openstack.org/openstack/nova-lxd"
# keep localrc to be able to set some vars in pre_test hook
export KEEP_LOCALRC=1
@ -62,6 +62,13 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
enable_plugin nova-lxd git://git.openstack.org/openstack/nova-lxd
# Enable linuxbridge agent and configure physical network
Q_AGENT=linuxbridge
PHYSICAL_NETWORK=default
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -72,15 +79,6 @@
export DEVSTACK_GATE_VIRT_DRIVER="lxd"
export PROJECTS="openstack/nova-lxd $PROJECTS"
# Enable linuxbridge agent and configure physical network
export DEVSTACK_LOCAL_CONFIG="Q_AGENT=linuxbridge"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=default"
# Enable nova-lxd devstack plugin. Provided repo should be
# cloned by zuul before devstack run and below provided
# link should not be used.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin nova-lxd git://git.openstack.org/openstack/nova-lxd"
# keep localrc to be able to set some vars in pre_test hook
export KEEP_LOCALRC=1

7
jenkins/jobs/nova.yaml
View File

@ -167,6 +167,11 @@
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
# NOTE(mriedem): cells v2 should be the default after newton-eol
NOVA_CONFIGURE_CELLSV2=True
- shell: |
#!/bin/bash -xe
export ENABLED_SERVICES=placement-api
@ -175,8 +180,6 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_NEUTRON=1
# NOTE(mriedem): cells v2 should be the default after newton-eol
export DEVSTACK_LOCAL_CONFIG="NOVA_CONFIGURE_CELLSV2=True"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE