diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f5d5a63e38aea2346ff2c49b370cdee6841d6d5..9a2e4710b245c766b8dff94d896ed1b3cf1baa12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,16 +7,15 @@ variables: stages: - lint - #- delete_stack_manual - extended #- heat_test - heat - - integration_test_downstream - ansible_create_cluster_stage - push_button_spawn_cluster -# - e2e - tests - - clean # manually delete stack + - integration_test_downstream + - clean + trigger_pipeline_in_Clusterbuild: stage: integration_test_downstream @@ -33,7 +32,7 @@ trigger_pipeline_in_monarch: - ansible script: - echo ${CI_JOB_TOKEN} - - "curl --request POST --form token=${CI_JOB_TOKEN} --form ref=cicd https://gitlab.erc.monash.edu.au/api/v4/projects/385/trigger/pipeline" # ID is from clusterbuild + - "curl --request POST --form token=${CI_JOB_TOKEN} --form ref=cicd https://gitlab.erc.monash.edu.au/api/v4/projects/385/trigger/pipeline" # ID is from monarch yamllint: diff --git a/CICD/master_playbook.yml b/CICD/master_playbook.yml index 192c9a35e7d39e187ad828448a4e30c02127f84f..e6977c6db964f29cce0529884a700c7c10abc83f 100644 --- a/CICD/master_playbook.yml +++ b/CICD/master_playbook.yml @@ -6,14 +6,16 @@ - import_playbook: plays/mgmtnodes.yml - import_playbook: plays/computenodes.yml -- name: check if loginnodes.yml file exists +- hosts: 127.0.0.1 gather_facts: false - hosts: 127.0.0.1 connection: local - stat: - path: plays/loginnodes.yml - register: loginnodes_play - -- name: Include loginnodes.yml if present - import_playbook: plays/loginnodes.yml + tasks: + - name: running stat + stat: + path: plays/loginnodes.yml + register: loginnodes_play + - debug: + var: loginnodes_play + +- import_playbook: plays/loginnodes.yml when: loginnodes_play.stat.exists == True