From 39bc2f1cc80e870d452f4a12bf789267a51f10a5 Mon Sep 17 00:00:00 2001 From: Deklan Dieterly Date: Wed, 2 Mar 2016 15:51:29 -0700 Subject: [PATCH] Add freezer-api job for tempest tests Add a freezer-api-devstack-dsvm job for the freezer-api to use. Configure tempest plugin to run in this job. Change-Id: Id90b10d01d4673918f568b445f03e7e0ebd232b9 --- jenkins/jobs/freezer.yaml | 41 +++++++++++++++++++++++++++++++++++++++ zuul/layout.yaml | 7 +++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/jenkins/jobs/freezer.yaml b/jenkins/jobs/freezer.yaml index 74db1e7152..5e1e8ad528 100644 --- a/jenkins/jobs/freezer.yaml +++ b/jenkins/jobs/freezer.yaml @@ -35,3 +35,44 @@ publishers: - devstack-logs - console-log + +- job: + name: gate-freezer-api-devstack-dsvm + node: devstack-trusty + + wrappers: + - build-timeout: + timeout: 70 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export PROJECTS="openstack/freezer-api $PROJECTS" + export PROJECTS="openstack/freezer-web-ui $PROJECTS" + export PROJECTS="openstack/freezer $PROJECTS" + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX="freezer_api_tempest_plugin" + + function gate_hook { + $BASE/new/freezer-api/devstack/gate_hook.sh + } + export -f gate_hook + + function post_test_hook { + cd /opt/stack/new/freezer-api/freezer_api/tests/ + ./post_test_hook.sh + } + export -f post_test_hook + + 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 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 31d8532b75..357fd74cc7 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2178,6 +2178,9 @@ jobs: - name: ^gate-freezer(-api|-web-ui)?-docs.*$ branch: ^(?!stable/(kilo|liberty)).*$ + - name: ^gate-freezer-api-devstack-dsvm.*$ + branch: ^(?!stable/kilo).*$ + - name: ^gate-freezer-devstack-dsvm.*$ branch: ^(?!stable/kilo).*$ @@ -5068,10 +5071,10 @@ projects: - name: python3-jobs - name: check-requirements check: - - gate-freezer-devstack-dsvm + - gate-freezer-api-devstack-dsvm - gate-freezer-api-pylint gate: - - gate-freezer-devstack-dsvm + - gate-freezer-api-devstack-dsvm - gate-freezer-api-pylint - name: openstack/freezer-web-ui