From 512e74e985b5714f86a981abe21864d58b5221cf Mon Sep 17 00:00:00 2001 From: Thomas Morin Date: Thu, 30 Mar 2017 11:24:03 -0500 Subject: [PATCH] networking-bagpipe: add an experimental fullstack job This is a first step to enable the fullstack tests of I967ba442ef433b7ada5a1a381f1571ec3cf23517 in the gate. It also adapts the scrip & template for the existing tempest job so that 'tempest' is passed to gate_hook.sh in the case of that job. Change-Id: I29c5d3798f3a3eed48aef6bd744ea71486135c8e --- jenkins/jobs/networking-bagpipe.yaml | 45 ++++++++++++++++++++++++++++ jenkins/jobs/projects.yaml | 5 ++++ zuul/layout.yaml | 5 ++++ 3 files changed, 55 insertions(+) diff --git a/jenkins/jobs/networking-bagpipe.yaml b/jenkins/jobs/networking-bagpipe.yaml index b426bac526..bfa1a2c446 100644 --- a/jenkins/jobs/networking-bagpipe.yaml +++ b/jenkins/jobs/networking-bagpipe.yaml @@ -46,3 +46,48 @@ publishers: - devstack-logs - console-log + +- job-template: + name: '{pipeline}-networking-bagpipe-dsvm-fullstack-{node}{suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 130 + - timestamps + + builders: + - print-template-name: + template-name: "{template-name}" + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_INSTALL_TESTONLY=1 + + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + export PROJECTS="openstack/networking-bagpipe $PROJECTS" + 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 fullstack + }} + export -f gate_hook + + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-bagpipe/devstack/devstack-gate-rc + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - test-results + - devstack-logs + - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index f4d4ac6b7b..ae1cbcee10 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -7203,6 +7203,11 @@ suffix: '' node: ubuntu-xenial which: '' + - '{pipeline}-networking-bagpipe-dsvm-fullstack-{node}{suffix}': + pipeline: gate + branch-override: default + suffix: -nv + node: ubuntu-xenial - project: name: networking-baremetal diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 361b401df8..6e4f04fec9 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2221,6 +2221,9 @@ jobs: - name: ^gate-tempest-dsvm-networking-bagpipe$ branch: ^(?!stable/(mitaka|newton)).*$ + - name: ^gate-networking-bagpipe-dsvm-fullstack-ubuntu-xenial + branch: ^(?!stable/(mitaka|newton|ocata)).*$ + # NOTE(tonyb): networking-bgpvpn is only setup to manage requirements since # ocata, so don't run this job on older branches. - name: gate-networking-bgpvpn-requirements @@ -12422,6 +12425,8 @@ projects: - gate-tempest-dsvm-networking-bagpipe - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-trusty - gate-tempest-dsvm-networking-bgpvpn-bagpipe-ubuntu-xenial + experimental: + - gate-networking-bagpipe-dsvm-fullstack-ubuntu-xenial-nv - name: openstack/networking-baremetal template: