diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14f0c91a4e098ae0a388cb4b863593bedfd5f28c..031886acca0c7db31772cd75b6168d43cc1ffb77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,9 +180,9 @@ deploy-to-production: - echo "deploy $TMP_PATH/$WAR_FILE --force" > deploy.cli - scp deploy.cli $SERVER_USER@$SERVER_IP:$TMP_PATH # Find name of currently deployed application. Undeploy. - #- CURRENTLY_DEPLOYED=$(ssh -vvv $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --commands=ls\ deployment | tr ' ' '\n' | grep VIPSCore-.*war") - #- echo $CURRENTLY_DEPLOYED - #- if [ -n "$CURRENTLY_DEPLOYED" ]; then ssh $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --command='undeploy $CURRENTLY_DEPLOYED'"; fi + - CURRENTLY_DEPLOYED=$(ssh -vvv $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --commands=ls\ deployment | tr ' ' '\n' | grep VIPSCore-.*war") + - echo $CURRENTLY_DEPLOYED + - if [ -n "$CURRENTLY_DEPLOYED" ]; then ssh $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --command='undeploy $CURRENTLY_DEPLOYED'"; fi # Deploy war file using JBoss CLI and credentials given in CI/CD variables - echo "Deploy $WAR_FILE using JBoss CLI" - ssh $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --file=$TMP_PATH/deploy.cli" > deployment.log 2>&1