diff --git a/jenkins/jobs/aodh.yaml b/jenkins/jobs/aodh.yaml index 61279ca975..942609504d 100644 --- a/jenkins/jobs/aodh.yaml +++ b/jenkins/jobs/aodh.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=90 export PROJECTS="openstack/aodh $PROJECTS" export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh" diff --git a/jenkins/jobs/astara.yaml b/jenkins/jobs/astara.yaml index 8cf87924dc..175bfe159a 100644 --- a/jenkins/jobs/astara.yaml +++ b/jenkins/jobs/astara.yaml @@ -4,7 +4,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST={run-tempest} export DEVSTACK_GATE_NEUTRON=1 export BRANCH_OVERRIDE={branch-override} diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml index 277103dc5b..669398127e 100644 --- a/jenkins/jobs/barbican.yaml +++ b/jenkins/jobs/barbican.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=barbican,tempest,keystone export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" @@ -55,7 +54,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=barbican,barbican-dogtag,tempest,keystone export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" @@ -96,7 +94,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=tempest,keystone export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" @@ -136,7 +133,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=barbican-dogtag,tempest,keystone export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" diff --git a/jenkins/jobs/blazar.yaml b/jenkins/jobs/blazar.yaml index 3c52abbcf7..9d7cb2eb93 100644 --- a/jenkins/jobs/blazar.yaml +++ b/jenkins/jobs/blazar.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export ENABLED_SERVICES=blazar,blazar-a,blazar-m,tempest export PROJECTS="openstack/blazar $PROJECTS" diff --git a/jenkins/jobs/castellan.yaml b/jenkins/jobs/castellan.yaml index ff2168d7a9..8bbbd6ca40 100644 --- a/jenkins/jobs/castellan.yaml +++ b/jenkins/jobs/castellan.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=tempest,keystone export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index f245cedddc..0836b871c1 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CEILOMETER_BACKEND={backend} export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" @@ -49,7 +48,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_CEILOMETER_BACKEND={backend} @@ -84,7 +82,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_NEUTRON=1 @@ -117,7 +114,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_CEILOMETER_BACKEND={backend} export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" export BRANCH_OVERRIDE={branch-override} @@ -159,7 +155,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export BRANCH_OVERRIDE={branch-override} export PROJECTS="openstack/python-ceilometerclient $PROJECTS" export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient @@ -221,7 +216,6 @@ esac fi - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=0 @@ -279,7 +273,6 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=0 diff --git a/jenkins/jobs/cells.yaml b/jenkins/jobs/cells.yaml index 217c66edae..3cb7844c4d 100644 --- a/jenkins/jobs/cells.yaml +++ b/jenkins/jobs/cells.yaml @@ -16,7 +16,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CELLS=1 export BRANCH_OVERRIDE={branch-override} diff --git a/jenkins/jobs/cinder.yaml b/jenkins/jobs/cinder.yaml index 045cb3a295..a5dec10142 100644 --- a/jenkins/jobs/cinder.yaml +++ b/jenkins/jobs/cinder.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export BRANCH_OVERRIDE={branch-override} export PROJECTS="openstack/python-cinderclient $PROJECTS" export DEVSTACK_PROJECT_FROM_GIT=python-cinderclient @@ -52,7 +51,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_LOCAL_CONFIG="CINDER_USE_MOD_WSGI=True" diff --git a/jenkins/jobs/congress.yaml b/jenkins/jobs/congress.yaml index c445a29b17..37216efdba 100644 --- a/jenkins/jobs/congress.yaml +++ b/jenkins/jobs/congress.yaml @@ -4,7 +4,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 65 - timestamps builders: @@ -31,7 +31,6 @@ export ENABLED_SERVICES export DEVSTACK_LOCAL_CONFIG export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests" diff --git a/jenkins/jobs/cue.yaml b/jenkins/jobs/cue.yaml index 6a87e4c68c..1b3c2d09ad 100644 --- a/jenkins/jobs/cue.yaml +++ b/jenkins/jobs/cue.yaml @@ -14,7 +14,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=100 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1