Commit 9ea0438e authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

In ".gitlab-ci.yml", added job "deploy_master_on_linux" and "deploy_master_on_windows:".

parent 20697569
Pipeline #89368 failed with stages
in 89 minutes and 45 seconds
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
# Variable Definitions # Variable Definitions
variables: variables:
VADERE_DEPLOYMENT_BASE_URL: "http://www.vadere.org/builds" VADERE_DEPLOYMENT_BASE_URL: "http://www.vadere.org/builds"
VADERE_PACKAGE_NAME: "vadere-${CI_COMMIT_REF_NAME}-${CI_ENVIRONMENT_NAME}.zip" VADERE_PACKAGE_NAME_BRANCHES: "vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip"
VADERE_PACKAGE_NAME_RELEASES: "vadere.${CI_COMMIT_TAG}.${CI_RUNNER_TAGS}.zip"
# Stage Definitions # Stage Definitions
stages: stages:
...@@ -82,13 +83,25 @@ stages: ...@@ -82,13 +83,25 @@ stages:
expire_in: 1 week expire_in: 1 week
when: on_success when: on_success
.template_deploy_branch: .template_deploy_master_automatically:
stage: deploy stage: deploy
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME} VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar
- scp ${VADERE_PACKAGE_NAME} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME} - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES}
only:
refs:
- master
when: on_success
.template_deploy_branch_manually:
stage: deploy
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar
- scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME_BRANCHES}
when: manual when: manual
# Job Definitions # Job Definitions
...@@ -109,13 +122,21 @@ run_seed_test_on_linux: ...@@ -109,13 +122,21 @@ run_seed_test_on_linux:
tags: tags:
- linux - linux
deploy_master_on_linux:
extends: .template_deploy_master_automatically
tags:
- linux
environment:
name: master/linux
url: ${VADERE_DEPLOYMENT_BASE_URL}/master/vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip
deploy_branch_on_linux: deploy_branch_on_linux:
extends: .template_deploy_branch extends: .template_deploy_branch_manually
tags: tags:
- linux - linux
environment: environment:
name: linux name: branches/linux
url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-${CI_COMMIT_REF_NAME}-${CI_ENVIRONMENT_NAME}.zip url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip
## Jobs for Windows runner (which is labelled with tag "windows") ## Jobs for Windows runner (which is labelled with tag "windows")
run_unit_tests_on_windows: run_unit_tests_on_windows:
...@@ -133,10 +154,18 @@ run_seed_test_on_windows: ...@@ -133,10 +154,18 @@ run_seed_test_on_windows:
tags: tags:
- windows - windows
deploy_master_on_windows:
extends: .template_deploy_master_automatically
tags:
- windows
environment:
name: master/windows
url: ${VADERE_DEPLOYMENT_BASE_URL}/master/vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip
deploy_branch_on_windows: deploy_branch_on_windows:
extends: .template_deploy_branch extends: .template_deploy_branch_manually
tags: tags:
- windows - windows
environment: environment:
name: windows name: branches/windows
url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-${CI_COMMIT_REF_NAME}-${CI_ENVIRONMENT_NAME}.zip url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment