Merge "ec2api tempest job"

jenkins/jobs/ec2-api.yaml

@@ -0,0 +1,42 @@
+- job-template:
+    name: '{pipeline}-tempest-dsvm-ec2api{branch-designator}'
+    node: '{node}'
+
+    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
+          # NOTE(sdague): which of tempest / neutron should be run
+          # here is pretty up for grabs, but this can be adjusted over
+          # time.
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          # Because we are testing a non standard project, add the
+          # our project repository. This makes zuul do the right
+          # reference magic for testing changes.
+          export PROJECTS="stackforge/ec2-api $PROJECTS"
+          # note the actual url here is somewhat irrelevant because it
+          # caches in nodepool, however make it a valid url for
+          # documentation purposes.
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api git://git.openstack.org/stackforge/ec2-api"
+
+          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

jenkins/jobs/projects.yaml

@@ -3210,6 +3210,11 @@
 
     jobs:
       - python-jobs
+      - '{pipeline}-tempest-dsvm-ec2api{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
 
 - project:
     name: ec2-driver

zuul/layout.yaml

@@ -597,6 +597,9 @@ jobs:
   - name: check-tempest-dsvm-f21
     branch: ^(?!stable)
     voting: false
+  - name: check-tempest-dsvm-ec2api
+    branch: ^(?!stable)
+    voting: false
   - name: check-tempest-dsvm-centos7
     branch: ^(?!stable/icehouse).*$
     voting: false
@@ -4472,6 +4475,7 @@ projects:
     check:
       - gate-ec2-api-pep8
       - gate-ec2-api-python27
+      - check-tempest-dsvm-ec2api
     gate:
       - gate-ec2-api-pep8
       - gate-ec2-api-python27