Commit 29f15b6f authored by BZoennchen's avatar BZoennchen

resolve merge conflicts.

parents e980bc8c fc320f3f
Pipeline #111293 failed with stages
in 161 minutes and 6 seconds

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

#builds, log/preferences files # Build artifacts, log and preference files
target/
*.out *.out
*.preferences.xml *.preferences.xml
#Tools and build utils
bin/ bin/
swing-inspector-linux-1.2.3/
target/
# C extensions
*.so
vadere_analysis_tool/build
#IntelliJ # IDEs
.idea/ .idea/
*.iml *.iml
#Eclipse
.settings/ .settings/
.metadata/ .metadata/
.classpath .classpath
.project .project
#package specific # Package specific
VadereGui/*.png VadereGui/*.png
VadereGui/*.svg VadereGui/*.svg
VadereGui/*.mov VadereGui/*.mov
VadereGui/testResources/**/*.legacy VadereGui/testResources/**/*.legacy
VadereUtils/testreports/*.txt VadereUtils/testreports/*.txt
VadereUtils/output/*
VadereSimulator/resources/current_commit_hash.txt VadereSimulator/resources/current_commit_hash.txt
VadereSimulator/testResources/**/*.legacy VadereSimulator/testResources/**/*.legacy
#model test output # Python (byte-compiled, optimized, DLL files etc.)
VadereModelTests/TestOSM/output/* __pycache__/
VadereModelTests/TestOSM_Group/output/* *.py[cod]
VadereModelTests/TestSFM/output/* *$py.class
VadereModelTests/TestGNM/output/* **/venv/
VadereModelTests/TestOVM/output/* Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool.egg-info/
VadereModelTests/TestOSM/legacy/* Tools/VadereAnalysisTools/VadereAnalysisTool/build/
VadereModelTests/TestOSM_Group/legacy/* Tools/VadereAnalysisTools/VadereAnalysisTool/dist/
VadereModelTests/TestSFM/legacy/*
VadereModelTests/TestGNM/legacy/*
VadereModelTests/TestOVM/legacy/*
VadereModelTests/TESTOVM/legacy/*
VadereModelTests/TestOSM/processed output/*
VadereModelTests/TestOSM_Group/processed output/*
VadereModelTests/TestSFM/processed output/*
VadereModelTests/TestGNM/processed output/*
VadereModelTests/TestOVM/processed output/*
VadereUtils/output/*
#deprecated: can potentially be removed
VadereGui/output/
#mac osx files # Operating system files
.DS_Store .DS_Store
#linux deskopt dotfiles
**/.directory **/.directory
/VadereModelTests/TestStairs/output
/VadereModelTests/TestStairs/legacy # Vadere output directories
**/output/
**/legacy/
**/*_private/
# # GitLab CI Jobs # # GitLab CI Job Configuration
# #
# Each of the jobs defined here is triggered by GitLab's CI pipeline. # Goal: Run all jobs defined here on all available runners (GNU/Linux and
# Windows).
#
# Procedure: Use GitLab job templates prefixed with a "." and use them in the
# actual job description with the "extends" keyword.
# #
# ## GitLab YAML Job Description Syntax # ## Job Description Syntax
# #
# <job_name>: # Job name which is displayed in web interface. # <job_name>: # Job name which is displayed in web interface.
# stage: <stage_name> # <build|test|deploy>: these stages are executed # stage: <stage_name> # Run "script" commands in this stage. The
# # one after another. A stage can contain multiple # # stages are executed sequentially.
# # jobs.
# script: # script:
# - <arbitrary_commands> # Here you can execute arbitratry terminal # - <arbitrary_commands> # Here you can execute arbitratry terminal
# # commands. If any of the commands return a # # commands. If any of the commands return a
# # non-zero exit code, the job fails. # # non-zero exit code, the job fails.
# #
# ## Maven Syntax for Skipping Unit Tests # ## References
# #
# General syntax to execute unit tests: # - https://docs.gitlab.com/ee/ci/yaml/README.html
#
# ``` # Variable Definitions
# mvn test variables:
# ``` VADERE_DEPLOYMENT_BASE_URL: "http://www.vadere.org/builds"
# VADERE_PACKAGE_NAME_BRANCHES: "vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip"
# The comma-separated list of tests after "-Dtest=<list>" is skipped. All other VADERE_PACKAGE_NAME_RELEASES: "vadere.${CI_COMMIT_TAG}.${CI_RUNNER_TAGS}.zip"
# tests are executed normally:
# # Stage Definitions
# ``` # Watch out: integration tests and the seed tests run after deployment, because
# mvn -Dtest=!TestClassA,!TestClassB,!TestClassC # currently tests fail very often because of timeouts. It is not clear if
# ``` # Vadere has slowed down somehow or the test environment is not reliable
# # (i.e.,the virtual machines). We have to track that!
# **Note:** on some CI instances the exclamation mark must be escaped by a stages:
# backslash. Otherwise, it is interpreted by the executing shell as special - unit_test
# command. - deploy
# - integration_test
# ## Unit Test Limitations - seed_test
# PLEASE, OMIT FOLLOWING GITLAB PITFALLS:
# #
# **Watch out:** OpenCL code cannot be run on virtual machines where tests are # 1. "include:" statement does not work properly and seems really buggy.
# executed. Therefore, skip this tests. # Therefore, define all job templates and jobs directly here.
# "include: .gitlab/ci/templates/test_stage_templates.yml" does not work!
unit_tests_with_coverage: # 2. Variables from "variables" section are not expanded correctly in "url"
stage: test # section of an "environment".
script: # Job Template Definitions
- Documentation/version-control/git-hook-vadere-software .template_unit_tests:
- mvn clean stage: unit_test
- mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel test # Skip OpenCL tests by using "-Dtest=!Test1,!Test2,..." because GitLab
- python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py # runners do not support OpenCL.
script:
run_scenario_files: - mvn clean
stage: deploy - mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel,!TestLWJGL test
- python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
script: artifacts:
- Documentation/version-control/git-hook-vadere-software when: on_success
- mvn clean paths:
- mvn -Dmaven.test.skip=true package - "*/target/coverage-reports"
- python3 Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py expire_in: 1 week
when: on_success
.template_scenario_files:
stage: integration_test
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py
artifacts:
when: on_failure
paths:
- "log_dir"
expire_in: 1 week
when: on_success
.template_deploy_master_automatically:
stage: deploy
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
- scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES}
only: