From c8130da96fafb45292585c0ea8be9efc1a1f0aec Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Fri, 6 May 2016 13:25:37 +0100 Subject: [PATCH] Add experimental job for Designate's knot2 agent backend There is a subtle difference in configuring devstack for a agent backend, requiring a new job template. Change-Id: I1d4512ab3c1ad0d56a6b970fa2163073ed127631 --- jenkins/jobs/designate.yaml | 50 ++++++++++++++++++++++++++++++++++++- jenkins/jobs/projects.yaml | 6 +++++ zuul/layout.yaml | 1 + 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml index e715600018..8ab1139fce 100644 --- a/jenkins/jobs/designate.yaml +++ b/jenkins/jobs/designate.yaml @@ -1,4 +1,4 @@ -# Experimental job for Designate+Tempest +# Job for Designate+Tempest - job-template: name: 'gate-tempest-dsvm-designate-{designate-driver}{job-suffix}' @@ -45,6 +45,54 @@ - devstack-logs - console-log +# Job for Designate+Tempest with an Agent based Backend +- job-template: + name: 'gate-tempest-dsvm-designate-agent-{designate-driver}{job-suffix}' + + node: '{node}' + + wrappers: + - build-timeout: + timeout: 70 + - timestamps + + builders: + - print-template-name: + template-name: "{template-name}" + - link-logs + - print-node-uuid + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX=designate + + export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_SERVICE_PORT_DNS=5322" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_BACKEND_DRIVER=agent" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_AGENT_BACKEND_DRIVER={designate-driver}" + + export PROJECTS="openstack/designate $PROJECTS" + export PROJECTS="openstack/python-designateclient $PROJECTS" + export PROJECTS="openstack/designate-dashboard $PROJECTS" + export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" + + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log + - job-template: name: 'gate-designate-dsvm-{designate-driver}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 1f27c9f934..761d347c8c 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1106,6 +1106,12 @@ designate-driver: - powerdns - bind9 + - 'gate-tempest-dsvm-designate-agent-{designate-driver}{job-suffix}': + node: ubuntu-trusty + branch-override: default + job-suffix: '' + designate-driver: + - knot2 - 'gate-designate-dsvm-{designate-driver}': node: ubuntu-trusty designate-driver: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 73c90a701b..814baf1f1e 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -883,6 +883,7 @@ project-templates: - gate-tempest-dsvm-designate-bind9 experimental: - gate-designate-dsvm-powerdns-postgres + - gate-tempest-dsvm-designate-agent-knot2 - name: javascript-jobs check: