Use CI_SPLIT for cache keys

Author: smola

.gitlab-ci.yml

@@ -143,18 +143,18 @@ default:
     CACHE_TYPE: lib #default
     RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE: 4 # Runtime.getRuntime().availableProcessors() returns incorrect or very high values in Kubernetes
   cache:
-    - key: '$CI_SERVER_VERSION-$CACHE_TYPE-$NORMALIZED_NODE_TOTAL-$NORMALIZED_NODE_INDEX' # Dependencies cache. Reset the cache every time gitlab is upgraded.  ~Every couple months
+    - key: '$CI_SERVER_VERSION-$CACHE_TYPE-$CI_SPLIT' # Dependencies cache. Reset the cache every time gitlab is upgraded.  ~Every couple months
       paths:
         # Cached dependencies and wrappers for gradle
         - .gradle/wrapper
         - .gradle/caches
         - .gradle/notifications
       policy: $DEPENDENCY_CACHE_POLICY
-      fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
+      #fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
         #- '$CI_SERVER_VERSION-$CACHE_TYPE'
-        - '$CI_SERVER_VERSION-base'
-        - '$CI_SERVER_VERSION-lib'
-    - key: $CI_PIPELINE_ID-$CACHE_TYPE-$NORMALIZED_NODE_TOTAL-$NORMALIZED_NODE_INDEX # Incremental build cache. Shared by all jobs in the pipeline of the same type
+        #- '$CI_SERVER_VERSION-base'
+        #- '$CI_SERVER_VERSION-lib'
+    - key: $CI_PIPELINE_ID-$CACHE_TYPE-$CI_SPLIT # Incremental build cache. Shared by all jobs in the pipeline of the same type
       paths:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory