Merge branch 'pipelinecleanup' into 'master'

Pipelinecleanup

See merge request !391

.gitlab-ci.yml

@@ -16,6 +16,7 @@ stages:
   - integration_test #https://docs.gitlab.com/ee/ci/triggers/
   - clean
   - testlustre
+  - clean_testlustre
 
 
 trigger_pipeline_in_Clusterbuild:
@@ -103,6 +104,18 @@ testlustre:
   after_script:
     - sleep 60 # the cluster needs to delete first
 
+clean_testlustre:
+  stage: clean_testlustre
+  tags:
+  - heat
+  before_script:
+    - echo "cleanup stack"
+    - sleep 30
+    - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
+  script:
+    - source ./$NECTAR_ALLOCATION-openrc.sh
+    - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+
 build_cluster_cicd:
   stage: heat
   allow_failure: false
@@ -178,7 +191,7 @@ tests:
     - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet mariadb" SQLNodes
     - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet slurmctld" ManagementNodes
     - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet slurmdbd" ManagementNodes
-    
+
     - bash -e ./tests/run_tests.sh all "files/inventory.$STACKNAME" "../gc_key.pem"
     - bash -e ./tests/run_tests.sh ComputeNodes "files/inventory.$STACKNAME" "../gc_key.pem"
     - bash -e ./tests/run_tests.sh LoginNodes "files/inventory.$STACKNAME" "../gc_key.pem"