From ca3bc6c788aaa4494fde0bebe18f16389bc58147 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 5 Feb 2016 19:07:27 +0100 Subject: [PATCH] Remove DEVSTACK_GATE_TIMEOUT [part 2] 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/d*.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. Note that the builder devstack-virtual-ironic uses devstack-timeout for setting DEVSTACK_GATE_TIMEOUT, remove devstack-timeout as well, it is not needed anymore. Change-Id: Ib9677376758475a4aa34c69b73428877e20556b2 --- jenkins/jobs/designate.yaml | 6 +- jenkins/jobs/devstack-gate.yaml | 212 +++++++++++--------------------- jenkins/jobs/dragonflow.yaml | 11 +- 3 files changed, 76 insertions(+), 153 deletions(-) diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml index a7378f6a48..83de44791a 100644 --- a/jenkins/jobs/designate.yaml +++ b/jenkins/jobs/designate.yaml @@ -5,7 +5,7 @@ wrappers: - build-timeout: - timeout: 65 + timeout: 70 - timestamps builders: @@ -15,7 +15,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 @@ -78,7 +77,7 @@ wrappers: - build-timeout: - timeout: 65 + timeout: 70 - timestamps builders: @@ -88,7 +87,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 288878e608..85b9afa246 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -4,7 +4,7 @@ wrappers: - build-timeout: - timeout: 60 + timeout: 65 - timestamps builders: @@ -44,7 +44,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -57,7 +57,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 BRANCH_OVERRIDE={branch-override} @@ -85,7 +84,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -98,7 +97,6 @@ #!/bin/bash -xe export PROJECTS="openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export BRANCH_OVERRIDE={branch-override} @@ -128,7 +126,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -141,7 +139,6 @@ #!/bin/bash -xe export PROJECTS="openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_LOCAL_CONFIG="TEMPEST_USE_TEST_ACCOUNTS=True" @@ -175,7 +172,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -192,7 +189,6 @@ fi export PROJECTS="$REPOSITORY $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_NEUTRON=1 @@ -221,7 +217,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -234,7 +230,6 @@ #!/bin/bash -xe export PROJECTS="openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_NEUTRON=1 @@ -273,7 +268,7 @@ wrappers: - build-timeout: - timeout: 65 + timeout: 70 - timestamps builders: @@ -286,7 +281,6 @@ #!/bin/bash -xe export PROJECTS="openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NO_SERVICES=1 ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net @@ -315,7 +309,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -327,7 +321,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="TEMPEST_USE_TEST_ACCOUNTS=True" @@ -348,7 +341,7 @@ wrappers: - build-timeout: - timeout: 185 + timeout: 190 - timestamps builders: @@ -359,7 +352,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_FULL=1 @@ -382,7 +374,7 @@ wrappers: - build-timeout: - timeout: 185 + timeout: 190 - timestamps builders: @@ -393,7 +385,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION=1 @@ -417,7 +408,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -429,7 +420,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_SMOKE_SERIAL=1 @@ -451,7 +441,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -463,7 +453,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 @@ -485,7 +474,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -497,7 +486,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 @@ -525,7 +513,7 @@ wrappers: - timeout: - timeout: 125 + timeout: 130 fail: true - timestamps @@ -538,7 +526,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_POSTGRES=1 @@ -561,7 +548,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -573,7 +560,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_LOCAL_CONFIG="TEMPEST_COMPUTE_TYPE=compute_legacy" # only run compute API tests @@ -596,7 +582,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -608,7 +594,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 # 2 line vars are so much fun export DEVSTACK_LOCAL_CONFIG="TEMPEST_COMPUTE_TYPE=compute_legacy" @@ -636,7 +621,7 @@ wrappers: - build-timeout: - timeout: 65 + timeout: 70 - timestamps builders: @@ -648,7 +633,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_SAHARA=1 export BRANCH_OVERRIDE={branch-override} @@ -676,7 +660,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -688,7 +672,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 @@ -710,7 +693,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -722,7 +705,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_LOCAL_CONFIG="LIBVIRT_TYPE=lxc" export DEVSTACK_LOCAL_CONFIG+=$'\n'"NOVA_BACKEND=LVM" @@ -752,7 +734,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT={devstack-timeout} export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES={postgres} export DEVSTACK_GATE_IRONIC=1 @@ -806,7 +787,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -819,7 +800,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_GRENADE=pullup @@ -843,7 +823,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -862,7 +842,6 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 publishers: - devstack-logs - console-log @@ -873,7 +852,7 @@ wrappers: - build-timeout: - timeout: 155 + timeout: 160 - timestamps builders: @@ -892,7 +871,6 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_FULL=1' - devstack-timeout: 150 publishers: - devstack-logs - console-log @@ -903,7 +881,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -922,7 +900,6 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 publishers: - devstack-logs @@ -935,7 +912,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -951,7 +928,6 @@ export PROJECTS="openstack/ironic-python-agent $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_IRONIC=1 export DEVSTACK_GATE_NEUTRON=1 @@ -977,7 +953,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -996,7 +972,6 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 publishers: - devstack-logs @@ -1008,7 +983,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1027,7 +1002,6 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 publishers: - devstack-logs @@ -1039,7 +1013,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1058,7 +1032,6 @@ ipxe-enabled: 1 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 publishers: - devstack-logs @@ -1070,7 +1043,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1089,7 +1062,6 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 publishers: - devstack-logs - console-log @@ -1100,7 +1072,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1119,7 +1091,7 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 + publishers: - devstack-logs - console-log @@ -1130,7 +1102,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1149,7 +1121,7 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 + publishers: - devstack-logs - console-log @@ -1160,7 +1132,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1179,7 +1151,7 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 120 + publishers: - devstack-logs - console-log @@ -1190,7 +1162,7 @@ wrappers: - build-timeout: - timeout: 60 + timeout: 65 - timestamps builders: @@ -1209,7 +1181,7 @@ ipxe-enabled: 0 branch-override: '{branch-override}' tempest-env: 'DEVSTACK_GATE_TEMPEST_REGEX=baremetal' - devstack-timeout: 55 + publishers: - devstack-logs - console-log @@ -1220,7 +1192,7 @@ wrappers: - build-timeout: - timeout: 95 + timeout: 100 - timestamps builders: @@ -1232,7 +1204,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NO_SERVICES=1 ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net @@ -1259,7 +1230,7 @@ wrappers: - build-timeout: - timeout: 95 + timeout: 100 - timestamps builders: @@ -1270,7 +1241,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NO_SERVICES=1 ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key,n-net @@ -1297,7 +1267,7 @@ wrappers: - build-timeout: - timeout: 95 + timeout: 100 - timestamps builders: @@ -1309,7 +1279,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NO_SERVICES=1 ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key @@ -1337,7 +1306,7 @@ wrappers: - build-timeout: - timeout: 95 + timeout: 100 - timestamps builders: @@ -1349,7 +1318,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NO_SERVICES=1 ENABLED_SERVICES=n-api,n-crt,n-cpu,n-sch,n-cond,g-api,g-reg,key @@ -1377,7 +1345,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1389,7 +1357,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_POSTGRES=1 @@ -1412,7 +1379,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1424,7 +1391,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_POSTGRES=1 @@ -1448,7 +1414,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1460,7 +1426,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 @@ -1496,7 +1461,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export BRANCH_OVERRIDE={branch-override} @@ -1530,7 +1494,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export BRANCH_OVERRIDE={branch-override} @@ -1572,7 +1535,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=forward export BRANCH_OVERRIDE={branch-override} @@ -1606,7 +1568,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_NEUTRON=1 @@ -1641,7 +1602,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=forward export DEVSTACK_GATE_NEUTRON=1 @@ -1663,7 +1623,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1673,7 +1633,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_GRENADE=pullup @@ -1713,7 +1672,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=partial-ncpu export BRANCH_OVERRIDE={branch-override} @@ -1751,7 +1709,6 @@ export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_IRONIC=1 @@ -1797,7 +1754,6 @@ export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=partial-ironic export DEVSTACK_GATE_IRONIC=1 @@ -1838,7 +1794,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export BRANCH_OVERRIDE={branch-override} @@ -1860,7 +1815,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1872,7 +1827,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_ALL=1 export DEVSTACK_GATE_NEUTRON=1 @@ -1894,7 +1848,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1906,7 +1860,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_COVERAGE=1 export BRANCH_OVERRIDE={branch-override} @@ -1927,7 +1880,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1939,7 +1892,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_STRESS=1 @@ -1962,7 +1914,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -1974,7 +1926,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 @@ -1997,7 +1948,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2009,7 +1960,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_STRESS=1 @@ -2033,7 +1983,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2045,7 +1995,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 @@ -2062,7 +2011,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2074,7 +2023,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_SMOKE_SERIAL=1 @@ -2091,7 +2039,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2103,7 +2051,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_TEMPEST_FULL=1 @@ -2127,7 +2074,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2139,7 +2086,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1 @@ -2166,7 +2112,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2179,7 +2125,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export BRANCH_OVERRIDE={branch-override} @@ -2202,7 +2147,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2215,7 +2160,6 @@ #!/bin/bash -xe export PROJECTS="openstack-dev/grenade openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup export BRANCH_OVERRIDE={branch-override} @@ -2245,7 +2189,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2257,7 +2201,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_CONFIGDRIVE=0 @@ -2284,7 +2227,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2296,7 +2239,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_CONFIGDRIVE=0 @@ -2323,7 +2265,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2335,7 +2277,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CEPH=1 @@ -2361,7 +2302,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2371,7 +2312,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 @@ -2402,7 +2342,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2415,7 +2355,6 @@ #!/bin/bash -xe export PROJECTS="openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CEPH=1 # Skip failing backup import/export test (bug 1476416) @@ -2441,7 +2380,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2453,7 +2392,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_ISCSI_HELPER=lioadm" @@ -2478,7 +2416,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2491,7 +2429,6 @@ #!/bin/bash -xe export PROJECTS="openstack/{name} $PROJECTS" export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_LOCAL_CONFIG="CINDER_ISCSI_HELPER=lioadm" @@ -2509,7 +2446,6 @@ - console-log - # A template for any project with a devstack-plugin to run the full # tempest suite with their project/plugin enabled. - job-template: @@ -2518,7 +2454,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2530,7 +2466,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 PROJECTS="{plugin-repo} $PROJECTS" @@ -2552,7 +2487,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2564,7 +2499,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 PROJECTS="{plugin-repo} openstack/oslo.messaging $PROJECTS" @@ -2587,7 +2521,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2603,7 +2537,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 PROJECTS="openstack/drbd-devstack $PROJECTS" @@ -2625,7 +2558,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2637,7 +2570,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS" export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-glusterfs git://git.openstack.org/stackforge/devstack-plugin-glusterfs" @@ -2667,7 +2599,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2683,7 +2615,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 # BDD driver doesn't support 'in-use' volume attachement so we need to skip such tests export DEVSTACK_GATE_TEMPEST_REGEX="^(?!.*(volume_in_use|test_volume_boot_pattern)).*volume" @@ -2706,7 +2637,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2720,7 +2651,6 @@ # # tests heat, sahara, trove in a single job. export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 @@ -2747,7 +2677,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2759,7 +2689,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_REGEX="database" export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" @@ -2781,7 +2710,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -2793,7 +2722,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="TEMPEST_RUN_VALIDATION=True" diff --git a/jenkins/jobs/dragonflow.yaml b/jenkins/jobs/dragonflow.yaml index f8ac2eff14..429edfe439 100644 --- a/jenkins/jobs/dragonflow.yaml +++ b/jenkins/jobs/dragonflow.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=1 export BRANCH_OVERRIDE={branch-override} @@ -49,7 +48,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -59,7 +58,6 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_NEUTRON=1 export RALLY_SCENARIO=dragonflow export BRANCH_OVERRIDE={branch-override} @@ -96,7 +94,7 @@ wrappers: - build-timeout: - timeout: 125 + timeout: 130 - timestamps builders: @@ -108,7 +106,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 @@ -141,4 +138,4 @@ publishers: - test-results - devstack-logs - - console-log \ No newline at end of file + - console-log