Commit b7114acd authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Finalized and cleaned up branch.

parent ba3158e8
Pipeline #89238 canceled with stages
# # GitLab CI Job Templates
#
# These templates can be used to execute jobs on different runners.
#
# Use GitLab's "include" keyword to include this file and the "extends" to
# extend a template below.
#
# For more details, see https://docs.gitlab.com/ee/ci/yaml/README.html#using-extends-and-include-together
.template_unit_tests:
stage: unit_test
# Skip OpenCL tests by using "-Dtest=!Test1,!Test2,..." because GitLab
# runners do not support OpenCL.
script:
- mvn clean
- mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel test
- python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
artifacts:
when: on_success
paths:
- "*/target/site/coverage-reports"
expire_in: 1 week
.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
.template_seed_test:
stage: integration_test
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 Tools/VadereAnalysisTools/VadereAnalysisTool/setup.py install --user
- python3 Tools/ContinuousIntegration/run_seed_comparison_test.py
artifacts:
when: on_failure
paths:
- "Tools/ContinuousIntegration/run_seed_comparison_test.d/output"
expire_in: 1 week
.template_deploy_branch:
stage: deploy
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME} 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}
when: manual
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# Goal: Run all jobs defined here on all available runners (GNU/Linux and # Goal: Run all jobs defined here on all available runners (GNU/Linux and
# Windows). # Windows).
# #
# Procedure: Use GitLab job templates in ".gitlab/ci/templates/" and use them # Procedure: Use GitLab job templates in and use them in the job description by
# in the job description by using the "extend" keyword. # using the "extend" keyword.
# #
# ## Job Description Syntax # ## Job Description Syntax
# #
...@@ -33,21 +33,13 @@ stages: ...@@ -33,21 +33,13 @@ stages:
# PLEASE, OMIT FOLLOWING GITLAB PITFALLS: # PLEASE, OMIT FOLLOWING GITLAB PITFALLS:
# #
# 1. "include: .gitlab/ci/windows_jobs.yml" does not work! # 1. "include:" statement does not work properly and seems really buggy.
# Seems a bug in GitLab's "include" statement. Therefore, define all jobs # Therefore, define all job templates and jobs directly here.
# directly here. # "include: .gitlab/ci/templates/test_stage_templates.yml" does not work!
# 2. Variables from "variables" section are not expanded correctly in "url" # 2. Variables from "variables" section are not expanded correctly in "url"
# section of an "environment". # section of an "environment".
# # GitLab CI Job Templates # Job Template Definitions
#
# These templates can be used to execute jobs on different runners.
#
# Use GitLab's "include" keyword to include this file and the "extends" to
# extend a template below.
#
# For more details, see https://docs.gitlab.com/ee/ci/yaml/README.html#using-extends-and-include-together
.template_unit_tests: .template_unit_tests:
stage: unit_test stage: unit_test
...@@ -106,7 +98,7 @@ stages: ...@@ -106,7 +98,7 @@ stages:
# Job Definitions # Job Definitions
# Jobs for GNU/Linux runner (which is labelled with tag "linux") ## Jobs for GNU/Linux runner (which is labelled with tag "linux")
run_unit_tests_on_linux: run_unit_tests_on_linux:
extends: .template_unit_tests extends: .template_unit_tests
tags: tags:
...@@ -130,7 +122,7 @@ deploy_branch_on_linux: ...@@ -130,7 +122,7 @@ deploy_branch_on_linux:
name: linux name: 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_ENVIRONMENT_NAME}.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:
extends: .template_unit_tests extends: .template_unit_tests
tags: tags:
...@@ -152,5 +144,4 @@ deploy_branch_on_windows: ...@@ -152,5 +144,4 @@ deploy_branch_on_windows:
- windows - windows
environment: environment:
name: windows name: windows
# WATCH OUT: Variables from "variables" section are not expanded correctly here.
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_ENVIRONMENT_NAME}.zip
# # GitLab CI Job Templates
#
# These templates can be used to execute jobs on different runners.
#
# Use GitLab's "include" keyword to include this file and the "extends" to
# extend a template below.
#
# For more details, see https://docs.gitlab.com/ee/ci/yaml/README.html#using-extends-and-include-together
.template_deploy_branch:
stage: deploy
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME} 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}
when: manual
# # GitLab CI Job Templates
#
# These templates can be used to execute jobs on different runners.
#
# Use GitLab's "include" keyword to include this file and the "extends" to
# extend a template below.
#
# For more details, see https://docs.gitlab.com/ee/ci/yaml/README.html#using-extends-and-include-together
.template_unit_tests:
stage: unit_test
# Skip OpenCL tests by using "-Dtest=!Test1,!Test2,..." because GitLab
# runners do not support OpenCL.
script:
- mvn clean
- mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel test
- python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
artifacts:
when: on_success
paths:
- "*/target/site/coverage-reports"
expire_in: 1 week
.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
.template_seed_test:
stage: integration_test
script:
- mvn clean
- mvn -Dmaven.test.skip=true package
- python3 Tools/VadereAnalysisTools/VadereAnalysisTool/setup.py install --user
- python3 Tools/ContinuousIntegration/run_seed_comparison_test.py
artifacts:
when: on_failure
paths:
- "Tools/ContinuousIntegration/run_seed_comparison_test.d/output"
expire_in: 1 week
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