summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny L <eli@mirantis.com>2019-02-26 22:31:14 +0000
committerEvgeny L <eli@mirantis.com>2019-02-26 22:40:32 +0000
commitefae9cd97feb47c6826006d27e3dc4b6a51485a8 (patch)
tree65b118b44059a1d6941a820133ed205d2d5c982e
parent7e5121f64496bacb9c2bc0ee755e82e9a50f35a0 (diff)
Uplift Armada and fix neutron configs
The latest version of Armada introduced a separate timeout value for tests [1], a default value for the timeout is 300, which is not large enough for Neutron tests. Also add wait.labels to ensure automatic deletion of test pods [2]. [1] https://review.openstack.org/#/c/618585/ [2] https://review.openstack.org/#/c/629313/ Change-Id: I86b1f9a8f17c273cf990189b2ffb07d60e3814b9
Notes
Notes (review): Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+1: Nishant Kumar <nishant.e.kumar@ericsson.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+2: Craig Anderson <craig.anderson@att.com> Workflow+1: Craig Anderson <craig.anderson@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 27 Feb 2019 23:32:02 +0000 Reviewed-on: https://review.openstack.org/639462 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/osh/openstack-compute-kit/neutron.yaml5
-rw-r--r--global/software/config/versions.yaml6
2 files changed, 8 insertions, 3 deletions
diff --git a/global/software/charts/osh/openstack-compute-kit/neutron.yaml b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
index 7119f1d..68c90bf 100644
--- a/global/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -201,6 +201,11 @@ data:
201 release_group: airship-neutron 201 release_group: airship-neutron
202 post: 202 post:
203 create: [] 203 create: []
204 test:
205 timeout: 500
206 wait:
207 labels:
208 release_group: airship-neutron
204 values: 209 values:
205 pod: 210 pod:
206 replicas: 211 replicas:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index f18eb74..618d6b6 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -248,7 +248,7 @@ data:
248 ucp: 248 ucp:
249 armada: 249 armada:
250 location: https://git.openstack.org/openstack/airship-armada 250 location: https://git.openstack.org/openstack/airship-armada
251 reference: 7f26bbcd59f97ab090516fe732912ebe7851eb30 251 reference: c7d9e21b1e3c144eee54d7d2a5da3eb562255894
252 subpath: charts/armada 252 subpath: charts/armada
253 type: git 253 type: git
254 armada-htk: 254 armada-htk:
@@ -448,7 +448,7 @@ data:
448 type: git 448 type: git
449 tiller: 449 tiller:
450 location: https://git.openstack.org/openstack/airship-armada 450 location: https://git.openstack.org/openstack/airship-armada
451 reference: 7f26bbcd59f97ab090516fe732912ebe7851eb30 451 reference: c7d9e21b1e3c144eee54d7d2a5da3eb562255894
452 subpath: charts/tiller 452 subpath: charts/tiller
453 type: git 453 type: git
454 tiller-htk: 454 tiller-htk:
@@ -525,7 +525,7 @@ data:
525 prometheus_process_exporter: {} 525 prometheus_process_exporter: {}
526 ucp: 526 ucp:
527 armada: 527 armada:
528 api: quay.io/airshipit/armada:7f26bbcd59f97ab090516fe732912ebe7851eb30 528 api: quay.io/airshipit/armada:c7d9e21b1e3c144eee54d7d2a5da3eb562255894
529 helm: docker.io/lachlanevenson/k8s-helm:v2.12.1 529 helm: docker.io/lachlanevenson/k8s-helm:v2.12.1
530 tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 530 tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
531 barbican: {} 531 barbican: {}