From f332ccb3b2ccb7e5a1bd1ed8193a4e13b7705548 Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Fri, 28 Feb 2020 09:44:05 +0000
Subject: [PATCH] resolved merge conflicts
Former-commit-id: f3e197e968c832c5d02df12bcb7404a27a77115a
---
.gitlab-ci.yml | 76 ++------------------------------------------------
1 file changed, 2 insertions(+), 74 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ade27fd5..e438efc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,16 +100,6 @@ ansible_create_cluster_stage:
- echo do it again
- ansible-playbook -i files/inventory.$STACKNAME --key-file ../gc_key.pem master_playbook.yml
-=======
->>>>>>> origin/master
- #after_script:
- #- rm ./files/inventory.$STACKNAME
- #only:
- # changes: #https://docs.gitlab.com/ee/ci/yaml/#onlychangesexceptchanges
- # - "master_playbook.yml"
- # - "vars/*.{yml,yaml}"
- # - schedules
- # - CICD/.gitlab-ci.yml
tests:
stage: tests
@@ -142,33 +132,6 @@ tests:
- bash -e ./tests/run_tests.sh NFSNodes "files/inventory.$STACKNAME" "../gc_key.pem"
- bash -e ./tests/run_tests.sh SQLNodes "files/inventory.$STACKNAME" "../gc_key.pem"
- # licensing https://gitlab.erc.monash.edu.au/hpc-team/license_server/tree/master/roles/avizo_license_monitor
-
-manual_cluster_spawn:
- stage: push_button_spawn_cluster
- tags:
- - heat
- - ansible
- before_script:
- - echo "press button spawn cluster."
- - echo "for this to work you have to provide a variable called manual stackname"
- - echo I still need to handle os password
- - echo $MANUAL_STACKNAME
- - 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 ./CICD/heat/heatcicdwrapper.sh create $MANUAL_STACKNAME
- - openstack stack list
- - export STACKNAME=$MANUAL_STACKNAME
- - sleep 25
- - bash -x CICD/ansible_create_cluster_script.sh
- when: manual
- only:
- refs:
- - "cicd"
-
extended:
stage: extended
tags:
@@ -185,17 +148,7 @@ extended:
variables:
- $EXTENDED != null
-clean:
- stage: clean
- 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
+
manual_cluster_spawn:
stage: push_button_spawn_cluster
tags:
@@ -220,22 +173,6 @@ manual_cluster_spawn:
only:
refs:
- "cicd"
-
-extended:
- stage: extended
- tags:
- - heat
- - ansible
- 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
- only:
- variables:
- - $EXTENDED != null
clean:
stage: clean
@@ -281,13 +218,4 @@ clean:
# - openstack stack list
# after_script:
# - sleep 20 # artifically wait a bit to make sure it is really dead
- - 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
- only:
- variables:
- - $EXTENDED != null
-
+
--
GitLab