Merge pull request #11 from intershop/main

release: 1.5.1
intershop · Sep 26, 2024 · 0918d23 · 0918d23
2 parents e1e131a + 7d0a76b
commit 0918d23
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ The respective CI pipelines of the different products of the Intershop Commerce
         registry: <NAME>.azurecr.io
         buildWith:
         - type: buildWith
-            tag: 11.X.X
+            tag: 12.X.X
             name: <IMAGE_NAME>
             registry: intershop
     ```

diff --git a/azure-pipelines.yml.icm.tmpl b/azure-pipelines.yml.icm.tmpl
@@ -19,10 +19,8 @@ resources:
         # Trigger by branch pipeline
         - master
         - develop
-      # Trigger by tag pipeline
-      tags:
-        include:
-          - version/*
+        # Trigger by tag pipeline
+        - refs/tags/version/*
 
   repositories:
     - repository: environments
@@ -36,15 +34,15 @@ resources:
       ref: refs/heads/stable/v1
 
 variables:
-  # Library icm11-build-configuration is provided by Intershops DevOps Environment. It provides
+  # Library icm-build-configuration is provided by Intershops DevOps Environment. It provides
   # the following variables:
   #  - BUILD_AGENT_POOL:                  name of the build agent pool
   #  - REPO_SERVICE_CONNECTION:           service connection to the customer ACR
   #  - REPO_PATH:                         host name and path of the customer ACR
   #  - INTERSHOP_REPO_SERVICE_CONNECTION: service connection to the Intershop container registry
   #  - INTERSHOP_REPO_PATH:               host name and path of the Intershop container registry
   #  - ARTIFACT_FEED                      name of the icm artifacts feed
-  - group: icm11-build-configuration
+  - group: icm-build-configuration
 
 #
 # The CD process can be very individual.

diff --git a/azure-pipelines.yml.iom.tmpl b/azure-pipelines.yml.iom.tmpl
@@ -20,9 +20,8 @@ resources:
         - master
         - develop
         # Trigger by tag pipeline
-      tags:
-        include:
-          - *
+        # Trigger by tag pipeline
+        - refs/tags/*
 
   repositories:
     - repository: <environments-repository>

diff --git a/azure-pipelines.yml.pwa.tmpl b/azure-pipelines.yml.pwa.tmpl
@@ -11,19 +11,17 @@ appendCommitMessageToRunName: false
 
 resources:
   pipelines:
-  - pipeline: <pwa-ci-pipeline>
-    source: <pwa-ci-pipeline>
+  - pipeline: <pwa-ci-pipeline-name>
+    source: <pwa-ci-pipeline-name>
     trigger:
       branches:
         include:
-          # Trigger by branch pipeline
-          - master
-          - develop
-          - release/*
-      # Trigger by tag pipeline
-      tags:
-        include:
-          - version/*
+        # Trigger by branch pipeline
+        - master
+        - develop
+        - release/*
+        # Trigger by tag pipeline
+        - refs/tags/version/*
 
   repositories:
     - repository: environments

diff --git a/tasks/process_pwa.sh b/tasks/process_pwa.sh
@@ -33,9 +33,9 @@ for image in "${IMAGES_MAPPING[@]}"; do
         TAG="${IMAGE_TAG}" \
         yq -i '.spec.values.image.tag = strenv(TAG)' "${PATCH_FILE_FULL_PATH}"
 
-        # If TEMP_USE_PREDEFINED_REGISTRY is true, than use PWAPREDEFINEDSSRREGISTRY as registry
+        # If TEMP_USE_PREDEFINED_REGISTRY is true, than use TEMP_PWA_PREDEFINED_SSR_REGISTRY as registry
         if [[ "${TEMP_USE_PREDEFINED_REGISTRY}" == "True" ]]; then
-        FINAL_REPOSITORY="${PWAPREDEFINEDSSRREGISTRY}/${IMAGE_NAME}"
+        FINAL_REPOSITORY="${TEMP_PWA_PREDEFINED_SSR_REGISTRY}/${IMAGE_NAME}"
         else
         FINAL_REPOSITORY="${IMAGE_REGISTRY}/${IMAGE_NAME}"
         fi
@@ -51,9 +51,9 @@ for image in "${IMAGES_MAPPING[@]}"; do
         TAG="${IMAGE_TAG}" \
         yq -i '.spec.values.cache.image.tag = strenv(TAG)' "${PATCH_FILE_FULL_PATH}"
 
-        # If ${TEMP_USE_PREDEFINED_REGISTRY} is true, than use PWAPREDEFINEDNGINXREGISTRY as registry
+        # If ${TEMP_USE_PREDEFINED_REGISTRY} is true, than use TEMP_PWA_PREDEFINED_NGINX_REGISTRY as registry
         if [[ "${TEMP_USE_PREDEFINED_REGISTRY}" == "True" ]]; then
-        FINAL_REPOSITORY="${PWAPREDEFINEDNGINXREGISTRY}/${IMAGE_NAME}"
+        FINAL_REPOSITORY="${TEMP_PWA_PREDEFINED_NGINX_REGISTRY}/${IMAGE_NAME}"
         else
         FINAL_REPOSITORY="${IMAGE_REGISTRY}/${IMAGE_NAME}"
         fi