diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 360f821ef8036d2922f837a28dbb6b2ff721bdb2..466caa3b592a36aa762098fc86c78164dc377d7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,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 @@ -34,7 +36,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 @@ -116,6 +119,7 @@ ansible_create_cluster_stage: - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../gc_key.pem --skip-tags monitoring computenodes.yml | tee nochange.log - echo [ `grep changed= ./nochange.log -c` = `grep changed=0 ./nochange.log -c` ] > bashtest.sh # a crude way to make sure all changed lines are equal to changed=0 - bash ./bashtest.sh + - ansible-playbook -i files/inventory.$STACKNAME --key-file ../../gc_key.pem --skip-tags monitoring --check computenodes.yml tests: