diff --git a/modules/openstack_project/files/jenkins_job_builder/config/climate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/climate.yaml index 89914dbda0..9b8187cd2f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/climate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/climate.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=climate export PROJECTS="stackforge/climate $PROJECTS" export PROJECTS="stackforge/python-climateclient $PROJECTS" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml index 3ef64e0c2e..fe2347977b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export ZUUL_BRANCH={branch-override} @@ -34,7 +35,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -43,6 +44,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_TEMPEST_FULL=1 @@ -65,7 +67,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -74,6 +76,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_SMOKE_SERIAL=1 @@ -96,7 +99,7 @@ wrappers: - timeout: - timeout: 180 + timeout: 185 fail: true - timestamps @@ -105,6 +108,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_ALL=1 export ZUUL_BRANCH={branch-override} @@ -126,7 +130,7 @@ wrappers: - timeout: - timeout: 180 + timeout: 185 fail: true - timestamps @@ -135,6 +139,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_STRESS=1 export ZUUL_BRANCH={branch-override} @@ -156,7 +161,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -165,6 +170,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_NEUTRON=1 @@ -188,7 +194,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -197,6 +203,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1 export ZUUL_BRANCH={branch-override} @@ -218,7 +225,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -227,6 +234,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1 export DEVSTACK_GATE_NEUTRON=1 @@ -249,7 +257,7 @@ wrappers: - timeout: - timeout: 180 + timeout: 185 fail: true - timestamps @@ -258,6 +266,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_ALL=1 export ZUUL_BRANCH={branch-override} @@ -279,7 +288,7 @@ wrappers: - timeout: - timeout: 180 + timeout: 185 fail: true - timestamps @@ -288,6 +297,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_COVERAGE=1 export ZUUL_BRANCH={branch-override} @@ -309,7 +319,7 @@ wrappers: - timeout: - timeout: 180 + timeout: 185 fail: true - timestamps @@ -318,6 +328,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_STRESS=1 export ZUUL_BRANCH={branch-override} @@ -339,7 +350,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -348,6 +359,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_SAVANNA=1 @@ -370,7 +382,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -379,6 +391,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_TEMPEST_FULL=1 @@ -402,7 +415,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -411,6 +424,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_SMOKE_SERIAL=1 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 28f0c614c2..3026c6f491 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export RE_EXEC=true @@ -30,7 +31,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -39,6 +40,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -55,7 +57,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -64,6 +66,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export BRANCH_OVERRIDE={branch-override} @@ -85,7 +88,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -94,6 +97,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_HEAT_SLOW=1 @@ -116,7 +120,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -125,6 +129,7 @@ - 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 @@ -147,7 +152,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -156,6 +161,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_NEUTRON=1 @@ -180,7 +186,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -189,6 +195,7 @@ - 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_ALLOW_TENANT_ISOLATION=1 @@ -213,7 +220,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -222,6 +229,7 @@ - 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_ALLOW_TENANT_ISOLATION=1 @@ -243,7 +251,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -252,6 +260,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_NEUTRON=1 @@ -276,7 +285,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -285,6 +294,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_TESTR_FULL=1 export DEVSTACK_GATE_NEUTRON=1 @@ -308,7 +318,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -317,6 +327,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_CELLS=1 export DEVSTACK_GATE_EXERCISES=1 export BRANCH_OVERRIDE={branch-override} @@ -338,7 +349,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -347,6 +358,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_CELLS=1 export BRANCH_OVERRIDE={branch-override} @@ -368,7 +380,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -377,6 +389,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_CELLS=1 @@ -399,7 +412,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -408,6 +421,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1 export BRANCH_OVERRIDE={branch-override} @@ -428,7 +442,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -437,6 +451,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1 export DEVSTACK_GATE_NEUTRON=1 @@ -459,7 +474,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -468,6 +483,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_POSTGRES=1 @@ -491,7 +507,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -500,6 +516,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_CONFIGDRIVE=0 @@ -522,7 +539,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -531,6 +548,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_POSTGRES=1 @@ -553,7 +571,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -562,6 +580,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_GRENADE=1 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -579,7 +598,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -588,6 +607,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_GRENADE=1 export DEVSTACK_GATE_GRENADE_FORWARD=1 @@ -606,7 +626,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -615,6 +635,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_GRENADE=1 export DEVSTACK_GATE_NEUTRON=1 @@ -633,7 +654,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -642,6 +663,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_GRENADE=1 export DEVSTACK_GATE_NEUTRON=1 @@ -661,7 +683,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -670,6 +692,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_SAVANNA=1 @@ -692,7 +715,7 @@ wrappers: - timeout: - timeout: 90 + timeout: 95 fail: true - timestamps @@ -701,6 +724,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=90 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_POSTGRES=1 @@ -724,7 +748,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -733,6 +757,7 @@ - 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 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml index 0d4e67edc3..84745ec393 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=manila,m-api,m-shr,m-sch export PROJECTS="stackforge/manila $PROJECTS" export PROJECTS="stackforge/python-manilaclient $PROJECTS" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index 94aedebde9..2107c62630 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_REQS_INTEGRATION=1 diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index 199f92400e..a34cda04ac 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 60 + timeout: 65 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=solum export PROJECTS="stackforge/solum" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml index 58f5e3b606..235919a8ef 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 export BRANCH_OVERRIDE={branch-override} @@ -43,7 +44,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -52,6 +53,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 export ZUUL_BRANCH={branch-override} diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml index 6f4b05ce50..e020a89160 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml @@ -4,7 +4,7 @@ wrappers: - timeout: - timeout: 120 + timeout: 125 fail: true - timestamps @@ -13,6 +13,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_EXERCISES=0 function gate_hook {