diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c50d10adf004cbca082c6e123160192dbc210fec..10eb850375404f1fe1a1baff2af3a2294e329533 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,7 +78,6 @@ deploy-to-staging: - 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. - - echo $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --commands=ls\ deployment - CURRENTLY_DEPLOYED=$(ssh $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 - ssh $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --command='undeploy $CURRENTLY_DEPLOYED'" @@ -132,6 +131,7 @@ 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. + - echo $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --commands=ls\ deployment - CURRENTLY_DEPLOYED=$(ssh $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 - ssh $SERVER_USER@$SERVER_IP "$CLI_PATH/jboss-cli.sh --user=$WILDFLY_ADMIN_USERNAME --password=$WILDFLY_ADMIN_PASSWORD --connect --command='undeploy $CURRENTLY_DEPLOYED'"