diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml index a3370f3cf9..3a3277e2ec 100644 --- a/jenkins/jobs/monasca.yaml +++ b/jenkins/jobs/monasca.yaml @@ -38,3 +38,47 @@ publishers: - devstack-logs - console-log + +- job: + name: gate-monasca-api-java-tempest-dsvm + node: 'devstack-precise || devstack-trusty' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_NEUTRON=1 + export ENABLED_SERVICES=tempest + export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api" + export PROJECTS="openstack/monasca-api $PROJECTS" + + export MONASCA_API_IMPLEMENTATION_LANG=java + export MONASCA_PERSISTER_IMPLEMENTATION_LANG=java + + function pre_test_hook { + # Configure and run tempest on monasca-api installation + source $BASE/new/monasca-api/devstack/pre_test_hook.sh + } + export -f pre_test_hook + + function post_test_hook { + # Configure and run tempest on monasca-api installation + source $BASE/new/monasca-api/devstack/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 694320de50..6255afaf89 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2223,7 +2223,7 @@ jobs: - name: gate-python-fuelclient-python27 branch: ^(?!stable/(?:6\.1)).*$ - - name: gate-monasca-api-tempest-dsvm + - name: gate-monasca-api-java-tempest-dsvm voting: false - name: watcher-coverage @@ -6081,10 +6081,12 @@ projects: - gate-monasca-api-python27 - gate-monasca-api-build - gate-monasca-api-tempest-dsvm + - gate-monasca-api-java-tempest-dsvm gate: - gate-monasca-api-pep8 - gate-monasca-api-python27 - gate-monasca-api-build + - gate-monasca-api-tempest-dsvm post: - monasca-api-localrepo-upload