Browse Source

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
tags/v19.03.06
Evgeny L 2 months ago
parent
commit
efae9cd97f

+ 5
- 0
global/software/charts/osh/openstack-compute-kit/neutron.yaml View File

@@ -201,6 +201,11 @@ data:
201 201
             release_group: airship-neutron
202 202
     post:
203 203
       create: []
204
+  test:
205
+    timeout: 500
206
+  wait:
207
+    labels:
208
+      release_group: airship-neutron
204 209
   values:
205 210
     pod:
206 211
       replicas:

+ 3
- 3
global/software/config/versions.yaml View File

@@ -248,7 +248,7 @@ data:
248 248
     ucp:
249 249
       armada:
250 250
         location: https://git.openstack.org/openstack/airship-armada
251
-        reference: 7f26bbcd59f97ab090516fe732912ebe7851eb30
251
+        reference: c7d9e21b1e3c144eee54d7d2a5da3eb562255894
252 252
         subpath: charts/armada
253 253
         type: git
254 254
       armada-htk:
@@ -448,7 +448,7 @@ data:
448 448
         type: git
449 449
       tiller:
450 450
         location: https://git.openstack.org/openstack/airship-armada
451
-        reference: 7f26bbcd59f97ab090516fe732912ebe7851eb30
451
+        reference: c7d9e21b1e3c144eee54d7d2a5da3eb562255894
452 452
         subpath: charts/tiller
453 453
         type: git
454 454
       tiller-htk:
@@ -525,7 +525,7 @@ data:
525 525
       prometheus_process_exporter: {}
526 526
     ucp:
527 527
       armada:
528
-        api: quay.io/airshipit/armada:7f26bbcd59f97ab090516fe732912ebe7851eb30
528
+        api: quay.io/airshipit/armada:c7d9e21b1e3c144eee54d7d2a5da3eb562255894
529 529
         helm: docker.io/lachlanevenson/k8s-helm:v2.12.1
530 530
         tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
531 531
       barbican: {}

Loading…
Cancel
Save