Merge "Pass disable_ssl_certificate_validation to gabbit tests"
diff --git a/.zuul.yaml b/.zuul.yaml
index 4f55a7a..d43343a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,90 +1,66 @@
- job:
name: heat-functional-convg-queens
parent: heat-functional-convg-mysql-lbaasv2
+ nodeset: legacy-ubuntu-xenial
override-checkout: stable/queens
vars:
branch_override: stable/queens
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-orig-queens
parent: heat-functional-orig-mysql-lbaasv2
override-checkout: stable/queens
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/queens
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-convg-rocky
parent: heat-functional-convg-mysql-lbaasv2
override-checkout: stable/rocky
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/rocky
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-orig-rocky
parent: heat-functional-orig-mysql-lbaasv2
override-checkout: stable/rocky
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/rocky
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-convg-stein
parent: heat-functional-convg-mysql-lbaasv2
override-checkout: stable/stein
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/stein
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-orig-stein
parent: heat-functional-orig-mysql-lbaasv2
override-checkout: stable/stein
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/stein
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-convg-train
parent: heat-functional-convg-mysql-lbaasv2
override-checkout: stable/train
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/train
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- job:
name: heat-functional-orig-train
parent: heat-functional-orig-mysql-lbaasv2
override-checkout: stable/train
+ nodeset: legacy-ubuntu-xenial
vars:
branch_override: stable/train
- nodeset:
- nodes:
- - name: primary
- label: ubuntu-xenial
- project:
templates:
diff --git a/heat_tempest_plugin/tests/api/gabbits/environments.yaml b/heat_tempest_plugin/tests/api/gabbits/environments.yaml
index 03849df..3d98a68 100644
--- a/heat_tempest_plugin/tests/api/gabbits/environments.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/environments.yaml
@@ -43,7 +43,7 @@
redirects: True
poll:
count: 10
- delay: 1.0
+ delay: 2.0
response_json_paths:
$.stack.stack_status: CREATE_COMPLETE
diff --git a/heat_tempest_plugin/tests/api/gabbits/resources.yaml b/heat_tempest_plugin/tests/api/gabbits/resources.yaml
index c99b6a9..f21fa67 100644
--- a/heat_tempest_plugin/tests/api/gabbits/resources.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/resources.yaml
@@ -38,7 +38,7 @@
redirects: True
poll:
count: 10
- delay: 1.0
+ delay: 2.0
response_json_paths:
$.stack.stack_status: CREATE_COMPLETE
diff --git a/heat_tempest_plugin/tests/api/gabbits/stacks.yaml b/heat_tempest_plugin/tests/api/gabbits/stacks.yaml
index ba15f7e..e2ce6a6 100644
--- a/heat_tempest_plugin/tests/api/gabbits/stacks.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/stacks.yaml
@@ -38,7 +38,7 @@
redirects: True
poll:
count: 10
- delay: 1.0
+ delay: 2.0
response_json_paths:
$.stack.stack_status: CREATE_COMPLETE
@@ -88,7 +88,7 @@
redirects: True
poll:
count: 10
- delay: 1.0
+ delay: 2.0
response_json_paths:
$.stack.stack_status: CREATE_COMPLETE
@@ -132,7 +132,7 @@
redirects: True
poll:
count: 10
- delay: 1.0
+ delay: 2.0
response_json_paths:
$.stack.stack_status: UPDATE_COMPLETE
@@ -152,7 +152,7 @@
redirects: True
poll:
count: 10
- delay: 1.0
+ delay: 2.0
response_json_paths:
$.stack.stack_status: UPDATE_COMPLETE