From 3b6e1f65bda9ee18f62eef25a632703be325ebc3 Mon Sep 17 00:00:00 2001
From: Alex Munoz <alex.munoz@exxcellent.de>
Date: Mon, 4 Jul 2022 21:50:59 +0200
Subject: [PATCH] refactor(*): update templates

---
 pipelines/npm.gitlab-ci.yml                        | 2 +-
 templates/common/common-ci-variablen.gitlab-ci.yml | 9 +++++++--
 templates/npm/npm-e2e.gitlab-ci.yml                | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pipelines/npm.gitlab-ci.yml b/pipelines/npm.gitlab-ci.yml
index fa68412..7864683 100644
--- a/pipelines/npm.gitlab-ci.yml
+++ b/pipelines/npm.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
   - verify
 
 include:
+  - '/templates/common/common-ci-variablen.gitlab-ci.yml'
   - '/templates/npm/npm-dependencies.gitlab-ci.yml'
   - '/templates/npm/npm-build.gitlab-ci.yml'
   - '/templates/npm/npm-test.gitlab-ci.yml'
@@ -11,7 +12,6 @@ include:
   - '/templates/npm/npm-e2e.gitlab-ci.yml'
 
 variables:
-  NODE_IMAGE: node:16.15-alpine
   FRONTEND_DIR: ''
   FRONTEND_BUILD_DIR: 'dist'
 
diff --git a/templates/common/common-ci-variablen.gitlab-ci.yml b/templates/common/common-ci-variablen.gitlab-ci.yml
index a1fb8eb..845b254 100644
--- a/templates/common/common-ci-variablen.gitlab-ci.yml
+++ b/templates/common/common-ci-variablen.gitlab-ci.yml
@@ -13,12 +13,12 @@ cache:
     # Cache Maven
     - .m2/repository
     # Cache NPM
-    - $FRONTEND_DIR/dist
+    #- $FRONTEND_DIR/dist
     # Cache Gradle
     - .gradle
     - '**/build'
     - "**/target"
-    - "**/node_modules"
+    #- "**/node_modules"
 
 
 variables:
@@ -28,6 +28,11 @@ variables:
     value: node:16-alpine3.15
     description: The node image that will be used from the CI.
 
+  ## Playwright Image
+  NODE_E2E_IMAGE:
+    value: mcr.microsoft.com/playwright:v1.23.1-focal
+    description: The image that will be used for E2E jobs.
+
   ##Global Variables we use in our CI scripts when using maven
   MAVEN_IMAGE:
     value: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-java-maven-base-image:java11-maven3.8.3_latest
diff --git a/templates/npm/npm-e2e.gitlab-ci.yml b/templates/npm/npm-e2e.gitlab-ci.yml
index d136610..28b3637 100644
--- a/templates/npm/npm-e2e.gitlab-ci.yml
+++ b/templates/npm/npm-e2e.gitlab-ci.yml
@@ -1,5 +1,5 @@
 .npm-e2e:
-  image: $E2E_IMAGE
+  image: $NODE_E2E_IMAGE
   stage: verify
   before_script:
     - >