Remove DEVSTACK_GATE_TIMEOUT [part 3]

With change Iff5e96bd80b8f165ccc7d6be09b53208613571eb, we do not need
to pass DEVSTACK_GATE_TIMEOUT anymore to devstack-gate, instead the
value from the build-timeout wrapper is passed.

Remove DEVSTACK_GATE_TIMEOUT for jenkins/jobs/[e-m]*.yaml

Increase timeout for all non-grenade jobs by 5 mins since
Iea866e4cc40e149e598f35e010ec855937bdf9ae will use a 10 minute
buffer and the internal timeout should stay the same. The grenade
jobs already have 10 mins of buffer, so no need
adjust the timeout.

Change-Id: Ied54d602d0cd1b994129f979ec25290e54980426

jenkins/jobs/ec2-api.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export TEMPEST_CONCURRENCY=2
           export BRANCH_OVERRIDE={branch-override}
@@ -57,7 +56,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 185
+          timeout: 190
       - timestamps
 
     builders:
@@ -67,7 +66,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=180
           export DEVSTACK_GATE_NEUTRON=1
 
           export PROJECTS="openstack/ec2-api $PROJECTS"
@@ -97,7 +95,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -113,7 +111,6 @@
           export DEVSTACK_GATE_VIRT_DRIVER=fake
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_TIMEOUT=120
 
           # Switch on tempest because m1.nano is created only for tempest...
           export DEVSTACK_GATE_TEMPEST=1
@@ -144,4 +141,3 @@
       - devstack-logs
       - console-log
       - rally-plot
-

jenkins/jobs/freezer.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export PROJECTS="openstack/freezer-api $PROJECTS"
           export PROJECTS="openstack/freezer-web-ui $PROJECTS"
           export PROJECTS="openstack/freezer $PROJECTS"

jenkins/jobs/gce-api.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_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -55,7 +54,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_NEUTRON=0
@@ -79,4 +77,3 @@
     publishers:
       - devstack-logs
       - console-log
-

jenkins/jobs/glance.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -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-glanceclient $PROJECTS"
           export DEVSTACK_PROJECT_FROM_GIT=python-glanceclient
@@ -42,7 +41,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -52,7 +51,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export BRANCH_OVERRIDE={branch-override}
           export DEVSTACK_PROJECT_FROM_GIT=glance_store
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then

jenkins/jobs/gnocchi.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
           export PROJECTS="openstack/gnocchi $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
 

jenkins/jobs/group-based-policy.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -15,7 +15,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1
@@ -53,7 +52,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -64,7 +63,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_UNSTACK=1
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_NEUTRON=1

jenkins/jobs/heat.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: 125
       - timestamps
 
     builders:
@@ -15,7 +15,6 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,h-api,h-api-cfn,h-api-cw,h-eng,heat
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
 
@@ -60,7 +59,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -76,7 +75,6 @@
               services+=,n-obj,
           fi
           export HEAT_BUILD_PIP_MIRROR=True
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
@@ -134,7 +132,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -144,7 +142,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_REGEX="orchestration"
           export DEVSTACK_GATE_HEAT=1
@@ -166,7 +163,7 @@
 
    wrappers:
      - build-timeout:
-         timeout: 65
+         timeout: 70
      - timestamps
 
    builders:
@@ -176,7 +173,6 @@
      - shell: |
          #!/bin/bash -xe
          export PYTHONUNBUFFERED=true
-         export DEVSTACK_GATE_TIMEOUT=60
          export BRANCH_OVERRIDE={branch-override}
          export PROJECTS="openstack/python-heatclient $PROJECTS"
          export DEVSTACK_PROJECT_FROM_GIT=python-heatclient
@@ -225,7 +221,6 @@
           fi
           export OVERRIDE_ENABLED_SERVICES
 
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_GRENADE=pullup
@@ -261,7 +256,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -271,7 +266,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_REGEX="orchestration"
           export DEVSTACK_GATE_HEAT=1

jenkins/jobs/horizon.yaml

@@ -17,7 +17,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 95
+          timeout: 100
       - timestamps
 
     builders:
@@ -29,7 +29,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=90
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_INSTALL_TESTONLY=1

jenkins/jobs/ironic.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_IRONIC=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -41,7 +40,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -51,7 +50,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_PROJECT_FROM_GIT=python-ironicclient
           export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,ir-api,ir-cond
@@ -82,7 +80,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -92,7 +90,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_IRONIC=1
           export DEVSTACK_GATE_NEUTRON=1
@@ -148,7 +145,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -158,7 +155,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_IRONIC=1
           export DEVSTACK_GATE_NEUTRON=1

jenkins/jobs/keystone.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -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-keystoneclient $PROJECTS"
           export DEVSTACK_PROJECT_FROM_GIT=python-keystoneclient

jenkins/jobs/kuryr.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
 
           export DEVSTACK_GATE_TEMPEST=0
@@ -44,7 +43,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -56,7 +55,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_INSTALL_TESTONLY=1
@@ -94,7 +92,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -104,7 +102,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_NEUTRON=1
           export RALLY_SCENARIO=kuryr
           export BRANCH_OVERRIDE={branch-override}
@@ -131,4 +128,4 @@
       - test-results
       - devstack-logs
       - console-log
-      - rally-plot
+      - rally-plot

jenkins/jobs/magnum.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_NEUTRON=1
 

jenkins/jobs/manila.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -16,7 +16,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_POSTGRES={postgres_enabled}
           export PROJECTS="openstack/python-manilaclient $PROJECTS"
@@ -74,7 +73,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -84,7 +83,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export PROJECTS="openstack/python-manilaclient $PROJECTS"
 
@@ -159,7 +157,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -169,7 +167,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-glusterfs $PROJECTS"
@@ -217,7 +214,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -227,7 +224,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-glusterfs $PROJECTS"
@@ -275,7 +271,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -285,7 +281,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-hdfs $PROJECTS"
@@ -325,7 +320,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 75
+          timeout: 80
       - timestamps
 
     builders:
@@ -335,7 +330,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=70
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-ceph $PROJECTS"

jenkins/jobs/mistral.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
 
           if [ "{component}" = "python-mistralclient" ] ; then

jenkins/jobs/monasca.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - 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"
@@ -44,7 +43,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -54,7 +53,6 @@
       - 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"
@@ -87,7 +85,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -96,7 +94,6 @@
       - devstack-checkout
       - shell: |
             export PYTHONUNBUFFERED=true
-            export DEVSTACK_GATE_TIMEOUT=120
             export DEVSTACK_GATE_TEMPEST=1
             export DEVSTACK_GATE_TEMPEST_FULL=1
             export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api"
@@ -126,7 +123,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -136,7 +133,6 @@
       - 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"

jenkins/jobs/murano.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -14,7 +14,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/murano $PROJECTS"
@@ -60,7 +59,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -70,7 +69,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/murano $PROJECTS"
@@ -126,7 +124,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 65
+          timeout: 70
       - timestamps
 
     builders:
@@ -136,7 +134,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_PROJECT_FROM_GIT=python-muranoclient
           export BRANCH_OVERRIDE={branch-override}
@@ -189,7 +186,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 125
+          timeout: 130
       - timestamps
 
     builders:
@@ -199,7 +196,6 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
           # Allow tempest to use site-packages with plugins