From dc3c40ab26bbbbe778b0aa308ba7273d8e91994c Mon Sep 17 00:00:00 2001 From: Aaron Sheffield Date: Mon, 9 Jul 2018 10:30:23 -0500 Subject: [PATCH] Enable Helm Tests for Airship Components - Add test: true to Armada charts to enable helm tests. Change-Id: I86f905cabeed5611683708cab0afc68594947a02 --- .../v1.0demo/software/charts/kubernetes/dns/coredns.yaml | 4 ++++ .../v1.0demo/software/charts/kubernetes/etcd/etcd.yaml | 4 ++++ .../software/charts/kubernetes/haproxy/haproxy.yaml | 4 ++++ .../global/v1.0demo/software/charts/ucp/armada/armada.yaml | 4 ++++ .../v1.0demo/software/charts/ucp/deckhand/deckhand.yaml | 4 ++++ .../v1.0demo/software/charts/ucp/drydock/drydock.yaml | 4 ++++ .../global/v1.0demo/software/charts/ucp/drydock/maas.yaml | 4 ++++ .../v1.0demo/software/charts/ucp/promenade/promenade.yaml | 4 ++++ .../v1.0demo/software/charts/ucp/shipyard/shipyard.yaml | 4 ++++ .../global/v1.0demo/software/config/versions.yaml | 6 +++--- .../v1.0dev/software/charts/kubernetes/dns/coredns.yaml | 4 ++++ .../v1.0dev/software/charts/kubernetes/etcd/etcd.yaml | 4 ++++ .../v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml | 4 ++++ .../global/v1.0dev/software/charts/ucp/armada/armada.yaml | 4 ++++ .../v1.0dev/software/charts/ucp/deckhand/deckhand.yaml | 4 ++++ .../global/v1.0dev/software/charts/ucp/drydock/drydock.yaml | 4 ++++ .../global/v1.0dev/software/charts/ucp/drydock/maas.yaml | 4 ++++ .../v1.0dev/software/charts/ucp/promenade/promenade.yaml | 4 ++++ .../v1.0dev/software/charts/ucp/shipyard/shipyard.yaml | 4 ++++ .../global/v1.0dev/software/config/versions.yaml | 6 +++--- 20 files changed, 78 insertions(+), 6 deletions(-) diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml index 3d2a37ca..2d145e91 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml @@ -71,6 +71,10 @@ data: timeout: 600 labels: release_group: airship-coredns + test: + enabled: true + options: + cleanup: true upgrade: no_hooks: false pre: diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml index d48ee8d3..df54a40d 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml @@ -77,6 +77,10 @@ data: timeout: 600 labels: release_group: airship-kubernetes-etcd + test: + enabled: true + options: + cleanup: true upgrade: no_hooks: false pre: diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml index 0d5427fc..d6b2ac46 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml @@ -34,6 +34,10 @@ data: timeout: 600 labels: release_group: airship-haproxy + test: + enabled: true + options: + cleanup: true upgrade: no_hooks: false pre: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml index 8cf14cb9..dce9d5a7 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml @@ -73,6 +73,10 @@ data: timeout: 100 labels: release_group: airship-ucp-armada + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml index 7be5fb76..a1e7e551 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml @@ -122,6 +122,10 @@ data: timeout: 600 labels: release_group: airship-ucp-deckhand + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml index 5c64bc17..c78b2375 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml @@ -139,6 +139,10 @@ data: timeout: 600 labels: release_group: airship-drydock + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml index 5def2b7c..256e8f06 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml @@ -160,6 +160,10 @@ data: timeout: 600 labels: release_group: airship-maas + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml index b441353c..e692bbdf 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml @@ -79,6 +79,10 @@ data: timeout: 600 labels: release_group: airship-ucp-promenade + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml index 19515ec2..8d6a2c60 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml @@ -205,6 +205,10 @@ data: timeout: 600 labels: release_group: airship-ucp-shipyard + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index e3aef5af..66ac84e5 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -132,7 +132,7 @@ data: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/armada - reference: 8e47a119348a9585dc104be16d9e5a2bd139f7ec + reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 armada-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra @@ -282,7 +282,7 @@ data: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/tiller - reference: 8e47a119348a9585dc104be16d9e5a2bd139f7ec + reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 tiller-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra @@ -415,7 +415,7 @@ data: images: ucp: armada: - api: quay.io/airshipit/armada:8e47a119348a9585dc104be16d9e5a2bd139f7ec + api: quay.io/airshipit/armada:b6479f660714a6d14c6aa291dc36b8451f1c9219 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml index 3d2a37ca..2d145e91 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml @@ -71,6 +71,10 @@ data: timeout: 600 labels: release_group: airship-coredns + test: + enabled: true + options: + cleanup: true upgrade: no_hooks: false pre: diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml index d48ee8d3..df54a40d 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml @@ -77,6 +77,10 @@ data: timeout: 600 labels: release_group: airship-kubernetes-etcd + test: + enabled: true + options: + cleanup: true upgrade: no_hooks: false pre: diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml index 0d5427fc..d6b2ac46 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml @@ -34,6 +34,10 @@ data: timeout: 600 labels: release_group: airship-haproxy + test: + enabled: true + options: + cleanup: true upgrade: no_hooks: false pre: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml index 8cf14cb9..dce9d5a7 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml @@ -73,6 +73,10 @@ data: timeout: 100 labels: release_group: airship-ucp-armada + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml index 7be5fb76..a1e7e551 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml @@ -122,6 +122,10 @@ data: timeout: 600 labels: release_group: airship-ucp-deckhand + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml index 5c64bc17..c78b2375 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml @@ -139,6 +139,10 @@ data: timeout: 600 labels: release_group: airship-drydock + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml index 5def2b7c..256e8f06 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml @@ -160,6 +160,10 @@ data: timeout: 600 labels: release_group: airship-maas + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml index b441353c..e692bbdf 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml @@ -79,6 +79,10 @@ data: timeout: 600 labels: release_group: airship-ucp-promenade + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml index 19515ec2..8d6a2c60 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml @@ -205,6 +205,10 @@ data: timeout: 600 labels: release_group: airship-ucp-shipyard + test: + enabled: true + options: + cleanup: true install: no_hooks: false upgrade: diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml index 1987ae41..b5e950f8 100644 --- a/deployment_files/global/v1.0dev/software/config/versions.yaml +++ b/deployment_files/global/v1.0dev/software/config/versions.yaml @@ -132,7 +132,7 @@ data: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/armada - reference: 8e47a119348a9585dc104be16d9e5a2bd139f7ec + reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 armada-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra @@ -282,7 +282,7 @@ data: type: git location: https://git.openstack.org/openstack/airship-armada subpath: charts/tiller - reference: 8e47a119348a9585dc104be16d9e5a2bd139f7ec + reference: b6479f660714a6d14c6aa291dc36b8451f1c9219 tiller-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra @@ -293,7 +293,7 @@ data: images: ucp: armada: - api: quay.io/airshipit/armada:8e47a119348a9585dc104be16d9e5a2bd139f7ec + api: quay.io/airshipit/armada:b6479f660714a6d14c6aa291dc36b8451f1c9219 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ks_endpoints: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata