diff --git a/jenkins/jobs/ec2-api.yaml b/jenkins/jobs/ec2-api.yaml index d3b4161f22..3675ed4411 100644 --- a/jenkins/jobs/ec2-api.yaml +++ b/jenkins/jobs/ec2-api.yaml @@ -1,47 +1,3 @@ -- job-template: - name: '{pipeline}-tempest-dsvm-ec2api{job-suffix}' - 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 - # Construct a regex to limiting scope of tempest - export DEVSTACK_GATE_TEMPEST_REGEX="tempest.thirdparty.boto" - export DEVSTACK_GATE_NEUTRON=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="openstack/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/openstack/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 - - job-template: name: '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}' node: '{node}' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 539c577fb5..e1e09cc266 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1256,11 +1256,6 @@ jobs: - python-jobs - pypi-jobs - - '{pipeline}-tempest-dsvm-ec2api{job-suffix}': - pipeline: gate - node: devstack-trusty - job-suffix: '' - branch-override: default - '{pipeline}-functional-{network}-dsvm-ec2api{job-suffix}': pipeline: gate node: devstack-trusty diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 823822a66a..f08a3557f7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1078,9 +1078,6 @@ jobs: - name: gate-functional-nova-network-dsvm-gceapi voting: false - - name: gate-tempest-dsvm-ec2api - voting: false - - name: ec2-api-rally-dsvm-fakevirt voting: false @@ -4635,7 +4632,6 @@ projects: - name: check-requirements - name: publish-to-pypi check: - - gate-tempest-dsvm-ec2api - gate-functional-neutron-dsvm-ec2api - gate-functional-nova-network-dsvm-ec2api experimental: