diff --git a/jenkins/jobs/kuryr.yaml b/jenkins/jobs/kuryr.yaml index cc31ed0b7b..3b98098cf0 100644 --- a/jenkins/jobs/kuryr.yaml +++ b/jenkins/jobs/kuryr.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{suffix}' + name: '{pipeline}-install-dsvm-kuryr-libnetwork{topology}-{node-release}{suffix}' node: '{node}' wrappers: @@ -22,12 +22,15 @@ export DEVSTACK_GATE_TEMPEST=0 - export ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi + if [ "{topology}" == "-multinode" ]; then + export CAPABILITY_SCOPE="global" + fi + export PROJECTS="openstack/kuryr-libnetwork $PROJECTS" export PROJECTS="openstack/devstack-plugin-container $PROJECTS" @@ -287,7 +290,6 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE @@ -349,7 +351,6 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE @@ -414,7 +415,6 @@ export DEVSTACK_PROJECT_FROM_GIT="kuryr" fi - export ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine function gate_hook {{ bash -xe $BASE/new/kuryr-libnetwork/kuryr_libnetwork/tests/contrib/gate_hook.sh diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 531d9e5fa9..4536de68b8 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6481,11 +6481,20 @@ - openstack-publish-jobs - openstack-releasenotes-jobs - pypi-jobs - - '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{suffix}': + - '{pipeline}-install-dsvm-kuryr-libnetwork{topology}-{node-release}{suffix}': pipeline: gate + topology: '' + node-release: ubuntu-xenial node: ubuntu-xenial suffix: '-nv' branch-override: default + - '{pipeline}-install-dsvm-kuryr-libnetwork{topology}-{node-release}{suffix}': + pipeline: gate + topology: '-multinode' + node-release: ubuntu-xenial + node: ubuntu-xenial-2-node + suffix: '-nv' + branch-override: default - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{suffix}': pipeline: gate node: ubuntu-xenial diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 54a23699c4..7eaf1bbe0d 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -11297,6 +11297,8 @@ projects: - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial - gate-kuryr-libnetwork-dsvm-fullstack-ubuntu-xenial - gate-kuryr-libnetwork-dsvm-fullstack-py35-ubuntu-xenial + experimental: + - gate-install-dsvm-kuryr-libnetwork-multinode-ubuntu-xenial-nv - name: openstack/kuryr-tempest-plugin template: