Commit a695297a authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'fix' into 'master' 

Fix

See merge request tools/continuous-integration/infrastructure/deployment-sites!35
parents 4a760e44 a51bf627

gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ check: 
      - master

  script:

    - echo "Checking inventory"

    - ansible-inventory -i inventory.ini --graph

    - ansible -i inventory.ini -m ping -u ${USERNAME:-maintenance} all:\!ungrouped:\!workstations || true

    - ansible-inventory -i inventory.yml --graph

    - ansible -i inventory.yml -m ping -u ${USERNAME:-maintenance} all:\!ungrouped:\!workstations || true



##########################################################################################################
@@ -66,5 +66,5 @@ deploy: 
    - mkdir -p /tmp/checkout && git clone "${REPOSITORY}" /tmp/checkout && cd /tmp/checkout

    - test -s ansible.cfg && export ANSIBLE_CONFIG="`pwd`/ansible.cfg" || true

    - test -s requirements.yml && ansible-galaxy install -r requirements.yml || true

    - test -s setup.yml && ansible-playbook ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" setup.yml || true

    - test -s "${PLAYBOOK:-run.yml}" && ansible-playbook ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" "${PLAYBOOK:-run.yml}" || ( echo "Can't use playbook [${PLAYBOOK:-run.yml}]!" && exit 1 )
 
    - test -s setup.yml && ansible-playbook ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.yml" setup.yml || true

    - test -s "${PLAYBOOK:-run.yml}" && ansible-playbook ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.yml" "${PLAYBOOK:-run.yml}" || ( echo "Can't use playbook [${PLAYBOOK:-run.yml}]!" && exit 1 )