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

Merge branch '3-ref-cktoring' into 'master' 

Resolve "ref*cktoring"

Closes #3

See merge request tools/continuous-integration/infrastructure/deployment-sites!31
parents 66427a2e 144e40a8

gitlab-ci.yml

+4 −8
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ deploy: 
    variables:

      - $GIT_URL =~ /^\S+$/

  script:

    - echo "Deploying configuration [${GIT_URL}] with parameters [${PARAMETERS}], playbook [${PLAYBOOK:-deploy.yml}]"

    - echo "Deploying configuration [${GIT_URL}] with parameters [${PARAMETERS}] and playbook [${PLAYBOOK:-run.yml}]"

    - export INVENTORY_DIRECTORY="`pwd`"

    - git config --global credential.helper store && echo "https://${GIT_LOGIN}:${GIT_PASSWORD}@$(echo ${GIT_URL} | sed -r 's#([^/])/[^/].*#\1#' | sed -e 's|https://||g')" > ~/.git-credentials

    - mkdir -p /tmp/checkout && git clone "${GIT_URL}" /tmp/checkout && cd /tmp/checkout
@@ -77,13 +77,9 @@ deploy: 
        ansible-playbook ${PARAMETERS} -u ${USERNAME:-maintenance} -i "${INVENTORY_DIRECTORY}/inventory.ini" setup.yml

      fi



      #      if [ -s run.sh ]; then

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

      #      el



      if [ -s "${PLAYBOOK:-deploy.yml}" ]; then

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

      if [ -s "${PLAYBOOK:-run.yml}" ]; then

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

      else

        echo "Can't use playbook [${PLAYBOOK:-deploy.yml}]!"

        echo "Can't use playbook [${PLAYBOOK:-run.yml}]!"

        exit 1

      fi