From 94bd7c28f9ba3386088f8b6513b2f53c50e95444 Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Wed, 22 Apr 2020 05:51:10 +0000
Subject: [PATCH] bugfix
Former-commit-id: a919f883fcb482746c03279b169f6766142e0a93
---
.gitlab-ci.yml | 72 +++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 622235df..86bba14c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,9 +13,27 @@ stages:
- ansible_create_cluster_stage
- push_button_spawn_cluster
- tests
-
+ - integration_test #https://docs.gitlab.com/ee/ci/triggers/
+ - clean
+trigger_pipeline_in_Clusterbuild:
+ stage: integration_test
+ tags:
+ - ansible
+ script:
+ - echo ${CI_JOB_TOKEN}
+ - curl --request POST --form token=${CI_JOB_TOKEN} --form "variables[TRIGGER_CI_COMMIT_SHA]=${CI_COMMIT_SHA}" --form ref=master https://gitlab.erc.monash.edu.au/api/v4/projects/193/trigger/pipeline # ID is from clusterbuild
+
+
+trigger_pipeline_in_monarch:
+ stage: integration_test
+ tags:
+ - ansible
+ script:
+ - echo ${CI_JOB_TOKEN}
+ - curl --request POST --form token=${CI_JOB_TOKEN} --form "variables[TRIGGER_CI_COMMIT_SHA]=${CI_COMMIT_SHA}" --form ref=master https://gitlab.erc.monash.edu.au/api/v4/projects/385/trigger/pipeline # ID is from monarch
+
yamllint:
stage: lint
@@ -27,6 +45,21 @@ yamllint:
- cd CICD
- yamllint -c ./.yamllintheat.yaml ./heat
+# delete_stack_manual:
+# stage: delete_stack_manual
+# tags:
+# - heat
+# before_script:
+# - echo "$GC_KEY" > gc_key.pem
+# - chmod 400 gc_key.pem
+# - echo "$HPCCICD_openrc" > ./$NECTAR_ALLOCATION-openrc.sh
+# script:
+# - echo "heat stage"
+# - source ./$NECTAR_ALLOCATION-openrc.sh
+# - openstack stack list
+# - bash -x ./CICD/heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+# when: manual
+
ansiblelint:
allow_failure: true
stage: lint
@@ -117,41 +150,8 @@ tests:
- bash -e ./tests/run_tests.sh slurm "files/inventory.$STACKNAME" "../gc_key.pem"
- cd plays
- ansible-playbook -i files/inventory.$STACKNAME --key-file ../gc_key.pem --skip-tags monitoring computenodes.yml | tee nochange.log
- - [ `grep changed= ./nochange.log -c` = `grep changed=0 ./nochange.log -c` ] # a crude way to make sure all changed lines are equal to changed=0
-
-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 ${CI_PROJECT_NAME}
- only:
- variables:
- - $EXTENDED != null
-
- - grep -qv "I could not find any resouces tagged with project_name:" ./files/inventory.$STACKNAME #fail if inventory file is empty
- - ansible -m ping -i files/inventory.$STACKNAME --key-file ../gc_key.pem all
- - ansible -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "sudo ls" all
- # Need to find a better check for sinfo
- #- ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "find /opt/ -name sinfo -type f" ManagementNodes
- #- ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "find /opt/ -name squeue -type f" ManagementNodes
- - 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"
- - bash -e ./tests/run_tests.sh ManagementNodes "files/inventory.$STACKNAME" "../gc_key.pem"
- - 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"
- - bash -e ./tests/run_tests.sh slurm "files/inventory.$STACKNAME" "../gc_key.pem"
+ - echo [ `grep changed= ./nochange.log -c` = `grep changed=1 ./nochange.log -c` ] > bashtest.sh # a crude way to make sure all changed lines are equal to changed=0
+ - bash ./bashtest.sh
extended:
stage: extended
--
GitLab