diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f974383314e5a0c373650570161e1a47ea3d88d..5977afedd63003deb46348299354460c4f4cf4e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,9 @@ trigger_pipeline_in_Clusterbuild: 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 - + only: + - ${CI_PROJECT_NAME} == 'ansible_cluster_in_a_box' + trigger_pipeline_in_monarch: stage: integration_test @@ -33,7 +35,8 @@ trigger_pipeline_in_monarch: 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 - + only: + - ${CI_PROJECT_NAME} == 'ansible_cluster_in_a_box' yamllint: stage: lint @@ -113,8 +116,8 @@ ansible_create_cluster_stage: - echo uglyuglyfix - ansible -i files/inventory.$STACKNAME --key-file ../gc_key.pem -b -a "systemctl restart slurmdbd" ManagementNodes - sleep 60 - - echo do it again - - ansible-playbook -i files/inventory.$STACKNAME --key-file ../gc_key.pem --skip-tags monitoring master_playbook.yml + - cd plays + - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../gc_key.pem --skip-tags monitoring --check computenodes.yml tests: