From 286243dfc942802056e9add39dd7c653827b528e Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Thu, 30 Jan 2020 11:28:51 +0000
Subject: [PATCH] the clean stage is now part of the extended pipeline
---
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5704eb68..4902cab2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,14 +7,15 @@ stages:
# - integration_test_downstream # working but unwanted here
# - trigger_pipeline_in_B # working but unwanted here
- lint
+ - clean # only on master
+ - extended
- heat
- ansible_create_cluster_stage
- push_button_spawn_cluster
# - e2e
- tests
- - extended
- - clean # only on master
+
#trigger_pipeline_in_B:
# stage: integration_test_downstream
# tags:
@@ -195,11 +196,12 @@ clean:
tags:
- heat
before_script:
- - echo "cleanup master"
+ - echo "cleanup stack"
- sleep 30
- - echo "$GC_KEY" > gc_key.pem
- - chmod 400 gc_key.pem
- echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
script:
- source ./$NECTAR_ALLOCATION-openrc.sh
- - bash -x ./heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+ - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+ only:
+ variables:
+ - $EXTENDED != null
\ No newline at end of file
--
GitLab