Fix runslim in ee template and match changes in PE template

OXID-eSales · Jul 5, 2024 · d15e625 · d15e625
1 parent 8d1708f
commit d15e625
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/.github/oxid-esales/defaults/ee.yaml b/.github/oxid-esales/defaults/ee.yaml
@@ -144,6 +144,9 @@ runtest:
 runscript:
   load_shop: *install_shop_prefix
 
+runslim:
+  load_shop: *install_shop_prefix
+
 sonarcloud:
   matrix:
     testplan: 'skip'

diff --git a/.github/oxid-esales/defaults/ee.yml b/.github/oxid-esales/defaults/ee.yml
@@ -144,6 +144,9 @@ runtest:
 runscript:
   load_shop: *install_shop_prefix
 
+runslim:
+  load_shop: *install_shop_prefix
+
 sonarcloud:
   matrix:
     testplan: 'skip'

diff --git a/.github/oxid-esales/defaults/pe.yaml b/.github/oxid-esales/defaults/pe.yaml
@@ -56,7 +56,8 @@ install_shop_with_modules: &install
   is_enterprise: *is_enterprise
   cache:
     # Needs to be here as $shop_type is different
-    prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
+    prepared_shop_prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
+    prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
 
 # BEGIN Deprecated, will be superseded by install:
 prepare_shop: *install
@@ -66,7 +67,7 @@ install_shop:
   git: *git
   is_enterprise: *is_enterprise
   cache:
-    prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
+    prefix: *install_shop_prefix
 
 install_module:
   cache:
@@ -124,6 +125,12 @@ runtest:
   coverage:
     path: ''
 
+runscript:
+  load_shop: *install_shop_prefix
+
+runslim:
+  load_shop: *install_shop_prefix
+
 sonarcloud:
   matrix:
     testplan: 'skip'

diff --git a/.github/oxid-esales/defaults/pe.yml b/.github/oxid-esales/defaults/pe.yml
@@ -56,7 +56,8 @@ install_shop_with_modules: &install
   is_enterprise: *is_enterprise
   cache:
     # Needs to be here as $shop_type is different
-    prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
+    prepared_shop_prefix: 'preparedShop-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
+    prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
 
 # BEGIN Deprecated, will be superseded by install:
 prepare_shop: *install
@@ -66,7 +67,7 @@ install_shop:
   git: *git
   is_enterprise: *is_enterprise
   cache:
-    prefix: &install_shop_prefix 'shopInstallation-{{ $shop_type }}-{{ .Github.SHA }}-{{ .Github.RunID }}'
+    prefix: *install_shop_prefix
 
 install_module:
   cache:
@@ -124,6 +125,12 @@ runtest:
   coverage:
     path: ''
 
+runscript:
+  load_shop: *install_shop_prefix
+
+runslim:
+  load_shop: *install_shop_prefix
+
 sonarcloud:
   matrix:
     testplan: 'skip'