Merge branch 'feature/adapt_to_new_tags' into 'master'

Adapting to new tags of the runners

See merge request !33

plugins.gitlab-ci.yml

@@ -61,11 +61,11 @@ Build_Windows:
         - job: "Generate_Project"
           artifacts: true
     
-Build_CentOS:
+Build_Linux:
     only: ['web', 'schedules']
-    extends: .Build_CentOS_
+    extends: .Build_Linux_
     tags:
-        - centos
+        - linux
         - unreal-4.26
     variables:
         GIT_STRATEGY: none   
@@ -76,16 +76,17 @@ Build_CentOS:
         - job: "Generate_Project"
           artifacts: true
 
-#Deploy_CAVE:
+#Deploy_Windows:
 #    only: ['web', 'schedules']
-#    extends: .Deploy_CAVE_
+#    extends: .Deploy_VRDev_
 #    needs:
-#        - job: "Build_CentOS"
+#        - job: "Build_Windows"
 #          artifacts: true          
 #
-#Deploy_Windows:
+#Deploy_CAVE:
 #    only: ['web', 'schedules']
-#    extends: .Deploy_VRDev_
+#    extends: .Deploy_CAVE_
 #    needs:
-#        - job: "Build_Windows"
+#        - job: "Build_Linux"
 #          artifacts: true
+#

project.gitlab-ci.yml

@@ -36,24 +36,27 @@ Build_Windows:
        CLIENT_CONFIG: "DebugGame"
        # CLIENT_CONFIG: "Shipping"
     
-Build_CentOS:
+Build_Linux:
     only: ['web', 'schedules']
-    extends: .Build_CentOS_
+    extends: .Build_Linux_
     tags:
-        - centos
+        - linux
         - unreal-4.26
     variables:
         CLIENT_CONFIG: "DebugGame"
         # CLIENT_CONFIG: "Shipping"
 
+Deploy_Windows:
+    only: ['web', 'schedules']
+    extends: .Deploy_VRDev_
+    needs:
+        - job: "Build_Windows"
+          artifacts: true
+
 Deploy_CAVE:
     only: ['web', 'schedules']
     extends: .Deploy_CAVE_
-    dependencies:
-        - Build_CentOS
+    needs:
+        - job: "Build_Linux"
+          artifacts: true
           
-Deploy_Windows:
-    only: ['web', 'schedules']
-    extends: .Deploy_VRDev_
-    dependencies:
-        - Build_Windows

shared_scripts.yml

@@ -21,7 +21,8 @@ variables:
     - web
     - schedules
   tags:
-    - centos
+    - linux
+    - project-generation
   variables: 
     GEN_TEMPLATE_REPO: "https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/unrealprojecttemplate.git"
     GEN_TEMPLATE_BRANCH: "4.26"
@@ -58,7 +59,7 @@ variables:
         EXTRA_ARGS: ""
     tags:
         - windows
-        - unreal-4.22
+        - unreal-4.26
     script:
         # Clean folder before building
         - git clean -qxfdf; git submodule foreach --quiet --recursive git clean -qxfdf
@@ -97,7 +98,7 @@ variables:
         
 ##################################Linux##################################
 
-.Build_CentOS_:
+.Build_Linux_:
     stage: build
     variables:
         GIT_STRATEGY: clone
@@ -105,8 +106,8 @@ variables:
         CLIENT_CONFIG: "Shipping"
         EXTRA_ARGS: ""
     tags:
-        - centos
-        - unreal-4.22
+        - linux
+        - unreal-4.26
     script:
         # Clean folder before building
         - git clean -qxfdf && git submodule foreach --quiet --recursive git clean -qxfdf
@@ -149,7 +150,7 @@ variables:
 .Deploy_VRDev_:
     stage: deploy
     tags:
-        - centos
+        - linux
         - networkdeploy
     allow_failure: true
     script:
@@ -170,7 +171,7 @@ variables:
 .Deploy_CAVE_:
     stage: deploy
     tags:
-        - centos
+        - linux
         - networkdeploy
     allow_failure: true
     script: