Merge "Prevent resource deletion in Live Lab"

2018-09-10 11:34:13 +00:00 · 2018-09-10 11:34:13 +00:00 · 92ba71209e
commit 92ba71209e
parent 260f7f8ef1 3836899a26
2 changed files with 5 additions and 0 deletions
--- a/tempest/templates/bin/_run-tests.sh.tpl
+++ b/tempest/templates/bin/_run-tests.sh.tpl
@ -18,12 +18,16 @@ limitations under the License.

 set -ex

+{{ if .Values.conf.cleanup.enabled }}
 tempest cleanup --init-saved-state

 if [ "true" == "{{- .Values.conf.cleanup.force -}}" ]; then
 trap "tempest cleanup; exit" 1 ERR
 fi
+{{- end }}

 {{ .Values.conf.script }}

+{{ if .Values.conf.cleanup.enabled }}
 tempest cleanup
+{{- end }}
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@ -200,6 +200,7 @@ conf:
      api_v3: True
  cleanup:
    force: false
+    enabled: true

 pvc:
  enabled: true