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

Merge branch 'trunk' into 'master' 

fixes

See merge request tools/continuous-integration/infrastructure/deployment-sites!3
parents c9e30fed 1edeeef9

gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ check: 
    - git clone "${GIT_URL}" /tmp/checkout

    - cd /tmp/checkout

    - ls -la

    - sh setup.sh

    - sh run.sh ${PARAMETERS} --check -u maintenance -i "${INVENTORY_DIRECTORY}/inventory.ini" ${PLAYBOOK:-deploy.yml}

    - sh setup.sh ${PARAMETERS} --check -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" "${PLAYBOOK:-deploy.yml}"

    - sh run.sh ${PARAMETERS} --check -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" "${PLAYBOOK:-deploy.yml}"



##########################################################################################################
@@ -69,5 +69,5 @@ deploy: 
    - echo "Deploying configuration [${GIT_URL}] with parameters [${PARAMETERS}]"

    - git clone "${GIT_URL}" /tmp/checkout

    - cd /tmp/checkout

    - sh setup.sh

    - sh run.sh ${PARAMETERS} -u maintenance -i "${INVENTORY_DIRECTORY}/inventory.ini" ${PLAYBOOK:-deploy.yml}
 
    - sh setup.sh ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" "${PLAYBOOK:-deploy.yml}"

    - sh run.sh ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" "${PLAYBOOK:-deploy.yml}"