diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml index a658b4abd0..f05f7d383d 100644 --- a/jenkins/jobs/designate.yaml +++ b/jenkins/jobs/designate.yaml @@ -97,6 +97,51 @@ - devstack-logs - console-log +- job-template: + name: 'gate-grenade-dsvm-designate-{designate-driver}{job-suffix}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 180 + - 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=1 + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_GRENADE=pullup + + export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_SERVICE_PORT_DNS=5322" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_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 PROJECTS="openstack-dev/grenade $PROJECTS" + + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + + export GRENADE_PLUGINRC="enable_grenade_plugin designate https://git.openstack.org/openstack/designate" + + 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/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 09c2edc860..3460479673 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -2391,7 +2391,6 @@ - devstack-logs - console-log - - job-template: name: '{pipeline}-tempest-dsvm-all{job-suffix}' node: '{node}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 23b44702a0..77fc140ea6 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1395,6 +1395,12 @@ - knot2 - djbdns - gdnsd + - 'gate-grenade-dsvm-designate-{designate-driver}{job-suffix}': + node: ubuntu-trusty + branch-override: default + job-suffix: '' + designate-driver: + - powerdns # Legacy Job - 'gate-designate-dsvm-{designate-driver}': node: ubuntu-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3e7b562ea8..9b95a5f165 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1018,6 +1018,7 @@ project-templates: - gate-tempest-dsvm-designate-agent-knot2 - gate-tempest-dsvm-designate-agent-djbdns - gate-tempest-dsvm-designate-agent-gdnsd + - gate-grenade-dsvm-designate-powerdns - name: javascript-jobs check: