Added PVC deletion check in test-storage-pool and openebs-percona-own…

…namespace in playbooks Signed-off-by: swarna <swarnalatha@cloudbyte.com>
dinukadesilva · Apr 23, 2018 · 1686007 · 1686007
1 parent b6a85a0
commit 1686007
Show file tree

Hide file tree

Showing 7 changed files with 331 additions and 156 deletions.
diff --git a/...playbooks/hyperconverged/percona-openebs-ownnamespace/k8s-percona-openebs-pod-cleanup.yml b/...playbooks/hyperconverged/percona-openebs-ownnamespace/k8s-percona-openebs-pod-cleanup.yml
@@ -1,35 +1,51 @@
-- hosts: localhost
 
-  vars_files:
-    - openebs-ns-vars.yml
 
-  tasks:
-
+
        - name: Delete percona mysql pod
-         shell: source ~/.profile; kubectl delete -f "{{ openebs_percona }}"
+         shell: source ~/.profile; kubectl delete -f "{{ percona_file }}" -n percona
          args:
            executable: /bin/bash
          delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
 
        - name: Confirm percona pod has been deleted
-         shell: source ~/.profile; kubectl get pods
+         shell: source ~/.profile; kubectl get pods --all-namespaces -l name=percona
+         args:
+           executable: /bin/bash
+         delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
+         register: result
+         until: "'percona' not in result.stdout"
+         delay: 30
+         retries: 10
+
+       - name: Get pvc name to verify successful pvc deletion
+         shell: source ~/.profile; kubectl get pvc --all-namespaces | grep {{ replace_with.0 }} | awk {'print $3'}
+         args:
+           executable: /bin/bash
+         delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
+         register: pvc
+
+       - name: Confirm percona pvc pod has been deleted
+         shell: source ~/.profile; kubectl get pods --all-namespaces | grep {{ pvc.stdout }}
          args:
            executable: /bin/bash
          delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
          register: result
          until: "'percona' not in result.stdout"
          delay: 120
          retries: 6
+         failed_when: "'pvc' and 'Running' in result.stdout"
+         delay: 30
+         retried: 10
 
        - name: Delete the openebs operator
          shell: source ~/.profile; kubectl delete -f "{{ openebs_operator }}"
          args:
            executable: /bin/bash
          delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
-
+         ignore_errors: true
 
        - name: Confirm pod has been deleted
-         shell: source ~/.profile; kubectl get pods
+         shell: source ~/.profile; kubectl get pods --all-namespaces
          args:
            executable: /bin/bash
          register: result
@@ -39,3 +55,11 @@
          delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
 
 
+       - name: Remove test artifacts artifcats
+         shell: rm -rf {{ percona_file }}; rm -rf {{ openebs_operator }}
+         args:
+           executable: /bin/bash
+         delegate_to: "{{groups['kubernetes-kubemasters'].0}}"
+
+
+
diff --git a/e2e/ansible/playbooks/hyperconverged/percona-openebs-ownnamespace/openebs-ns-vars.yml b/e2e/ansible/playbooks/hyperconverged/percona-openebs-ownnamespace/openebs-ns-vars.yml
@@ -7,26 +7,34 @@ openebs_operator_alias: openebs-operator.yaml
 
 openebs_storageclass: openebs-storageclasses.yaml
 
-openebs_percona: percona-ns-percona-sc-percona.yaml
 
 openebs_storageclasses_link: https://raw.githubusercontent.com/openebs/openebs/master/k8s/openebs-storageclasses.yaml
 
-percona_loadgen: sql-loadgen.yaml
 
 openebs_storageclasses_alias: openebs-storageclasses.yaml
 
 percona_mysql_plugin_link: https://raw.githubusercontent.com/openebs/openebs/master/k8s/demo/percona/demo-percona-mysql-pvc.yaml
 
-# Image tag for openebs containers
-# Accepted entries (ci, latest): Default: latest
-test_tag: latest
 
+percona_links:
+  - https://raw.githubusercontent.com/openebs/elves/master/e2e/percona-liveness/percona.yaml
+  - https://raw.githubusercontent.com/openebs/elves/master/e2e/percona-liveness/sql-test.sh
 
-pod_yaml_alias: demo-percona-mysql-pvc.yaml
+percona_file: demo-percona-mysql-pvc.yaml
 
-percona_mysql_vol_size: 5G
+replace_item:
+  - demo-vol1-claim
+  - demo-vol1
 
+replace_with:
+  - percona-diffns-claim
+  - percona-diffns
+
+test_name: deploy openebs and percona with its own namespace
 
 deb_packages:
   - python-pip
 
+test_pod_regex: maya*|openebs*|pvc*|percona*
+
+test_log_path: setup/logs/openebs-percona-ownnamespace.log