diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10d65cc99a69b32b192268a649aa9e64206dcff6..19a926ff928db364937c9c28581840db0cf88baa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,8 +132,9 @@ deploy-to-production: - 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 + ### Kommandoen nedenfor tryner - uten at det kommer noen feilmelding. Kan det være fordi det ikke var deployet noe fra før? + - 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'" # Deploy war file using JBoss CLI and credentials given in CI/CD variables - echo "Deploy $WAR_FILE using JBoss CLI" @@ -202,7 +203,7 @@ upload-and-tag-release: - git merge -m "[ci skip] Merge branch '${RELEASE_BRANCH}' into ${MAIN_BRANCH}" --no-ff $RELEASE_BRANCH # Change version in pom.xml - build new pom_with_models.xml - "./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS validate -DbumpPatch" - - "python build_pom_with_models.py" + - "python3 build_pom_with_models.py" - export SNAPSHOT_VERSION=$(./mvnw $MAVEN_POM_WITH_MODELS $MAVEN_CLI_OPTS $MAVEN_OPTS --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") - echo "New version in main '$SNAPSHOT_VERSION'" - git add pom.xml