In ".gitlab-ci.yml", cleaned up "deploy" stage.

.gitlab-ci.yml

@@ -3,6 +3,9 @@
 # Goal: Run all jobs defined here on all available runners (GNU/Linux and
 # Windows).
 # 
+# Procedure: Use GitLab job templates in ".gitlab/ci/templates/" and use them
+# in the job description by using the "extend" keyword.
+#
 # ## Job Description Syntax
 #
 # <job_name>:                   # Job name which is displayed in web interface.
@@ -13,9 +16,6 @@
 #                               # commands. If any of the commands return a
 #                               # non-zero exit code, the job fails.
 #
-# Procedure: Use GitLab job templates in ".gitlab/ci/templates/" and use them
-# in the job description by using the "extend" keyword.
-#
 # ## References
 #
 # - https://docs.gitlab.com/ee/ci/yaml/README.html
@@ -23,7 +23,7 @@
 # Variable Definitions
 variables:
     VADERE_DEPLOYMENT_BASE_URL: "http://www.vadere.org/builds"
-    VADERE_PACKAGE_NAME: "vadere.${CI_COMMIT_REF_NAME}.${CI_ENVIRONMENT_NAME}"
+    VADERE_PACKAGE_NAME: "vadere.${CI_COMMIT_REF_NAME}.${CI_ENVIRONMENT_NAME}.zip"
 
 # Stage Definitions
 stages:
@@ -38,10 +38,20 @@ include: .gitlab/ci/templates/deploy_stage_templates.yml
 # Seems a bug in GitLab's "include" statement. Therefore, define all jobs
 # directly here.
 
+# Jobs for GNU/Linux runner (which is labelled with tag "linux")
+deploy_branch_on_linux:
+    extends: .template_deploy_branch
+    tags:
+        - linux        
+    environment:
+        name: linux
+        url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-console.${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}.${CI_ENVIRONMENT_NAME}"
+
+# Jobs for Windows runner (which is labelled with tag "windows")
 deploy_branch_on_windows:
     extends: .template_deploy_branch
     tags:
         - windows        
     environment:
         name: windows
-        url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-console.${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}.${CI_ENVIRONMENT_NAME}.jar"
+        url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-console.${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}.${CI_ENVIRONMENT_NAME}"

.gitlab-ci.yml.bak.bak

+# # GitLab CI Job Configuration
+#
+# Goal: Run all jobs defined here on all available runners (GNU/Linux and
+# Windows).
+# 
+# ## Job Description Syntax
+#
+# <job_name>:                   # Job name which is displayed in web interface.
+#   stage: <stage_name>         # Run "script" commands in this stage. The
+#                               # stages are exececuted sequentially.
+#   script:
+#      - <arbitrary_commands>   # Here you can execute arbitratry terminal
+#                               # commands. If any of the commands return a
+#                               # non-zero exit code, the job fails.
+#
+# Procedure: Use GitLab job templates in ".gitlab/ci/templates/" and use them
+# in the job description by using the "extend" keyword.
+#
+# ## References
+#
+# - https://docs.gitlab.com/ee/ci/yaml/README.html
+
+# Variable Definitions
+variables:
+    VADERE_DEPLOYMENT_BASE_URL: "http://www.vadere.org/builds"
+    VADERE_PACKAGE_NAME: "vadere.${CI_COMMIT_REF_NAME}.${CI_ENVIRONMENT_NAME}"
+
+# Stage Definitions
+stages:
+    - deploy
+
+include: .gitlab/ci/templates/deploy_stage_templates.yml
+# include: .gitlab/ci/templates/test_stage_templates.yml
+
+# Job Definitions
+
+# WATCH OUT: "include: .gitlab/ci/windows_jobs.yml" does not work!
+# Seems a bug in GitLab's "include" statement. Therefore, define all jobs
+# directly here.
+
+deploy_branch_on_windows:
+    extends: .template_deploy_branch
+    tags:
+        - windows        
+    environment:
+        name: windows
+        url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-console.${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}.${CI_ENVIRONMENT_NAME}.jar"

.gitlab-ci.yml.old

+# # GitLab CI Job Configuration
+#
+# Goal: Run all jobs defined here on all available runners (GNU/Linux and
+# Windows).
+# 
+# ## Job Description Syntax
+#
+# <job_name>:                   # Job name which is displayed in web interface.
+#   stage: <stage_name>         # Run "script" commands in this stage. The
+#                               # stages are exececuted sequentially.
+#   script:
+#      - <arbitrary_commands>   # Here you can execute arbitratry terminal
+#                               # commands. If any of the commands return a
+#                               # non-zero exit code, the job fails.
+#
+# ## References
+#
+# - https://docs.gitlab.com/ee/ci/yaml/README.html
+
+stages:
+    - unit_test
+    - integration_test
+    - deploy
+
+include: .gitlab-ci-templates.yml
+
+# Jobs for GNU/Linux runner (which is labelled with tag "linux")
+run_unit_tests_on_linux:
+    extends: .template_unit_tests
+    tags:
+        - linux
+
+run_scenario_files_on_linux:
+    extends: .template_scenario_files
+    tags:
+        - linux
+
+run_seed_test_on_linux:
+    extends: .template_seed_test
+    tags:
+        - linux
+
+deploy_on_windows:
+    extends: .template_deploy
+    tags:
+        - linux
+
+# Jobs for Windows runner (which is labelled with tag "windows")
+
+run_unit_tests_on_windows:
+    extends: .template_unit_tests
+    tags:
+        - windows
+
+run_scenario_files_on_windows:
+    extends: .template_scenario_files
+    tags:
+        - windows
+
+run_seed_test_on_windows:
+    extends: .template_seed_test
+    tags:
+        - windows
+
+deploy_on_windows:
+    extends: .template_deploy
+    tags:
+        - windows

.gitlab/ci/jobs/windows_jobs.yml

-# Watch out: "include: .gitlab/ci/windows_jobs.yml" does not work!
-# Seems a bug in GitLab's "include" statement.
-deploy_branch_on_windows:
-    extends: .template_deploy_branch
-    tags:
-        - windows        
-    environment:
-        name: windows
-        url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere-console.${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}.${CI_ENVIRONMENT_NAME}.jar" 

.gitlab/ci/templates/deploy_stage_templates.yml

@@ -13,7 +13,7 @@
     script:
         - mvn clean
         - mvn -Dmaven.test.skip=true package
-        - python3 -m zipfile --create ${VADERE_PACKAGE_NAME}.zip VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar
-        - scp ${VADERE_PACKAGE_NAME}.zip di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME}.zip
+        - python3 -m zipfile --create ${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: always
+    when: manual