From c239ece5c1dd3982b5a27cc70ed61d51d4dd65bc Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Mon, 1 Apr 2024 14:28:19 +0330 Subject: [PATCH 01/12] Rename delete-bin-obj-folders.bat to delete-temp-directories.bat --- delete-bin-obj-folders.bat => delete-temp-directories.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename delete-bin-obj-folders.bat => delete-temp-directories.bat (95%) diff --git a/delete-bin-obj-folders.bat b/delete-temp-directories.bat similarity index 95% rename from delete-bin-obj-folders.bat rename to delete-temp-directories.bat index 9e2a02a6..20389227 100644 --- a/delete-bin-obj-folders.bat +++ b/delete-temp-directories.bat @@ -13,4 +13,4 @@ FOR /d /r . %%d in (bin,obj, logs, node_modules) DO (( ECHO. ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit. -pause > nul \ No newline at end of file +pause > nul From c4f78f5921e6380529f89b34ce6fec5e79291811 Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Mon, 1 Apr 2024 14:30:43 +0330 Subject: [PATCH 02/12] Update delete-temp-directories.bat Refactor and user experience improvements. --- delete-temp-directories.bat | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat index 20389227..5921c8f4 100644 --- a/delete-temp-directories.bat +++ b/delete-temp-directories.bat @@ -1,16 +1,21 @@ -@ECHO off +@echo off cls -ECHO Deleting all BIN and OBJ folders... -ECHO. +set directories= bin, obj, logs, node_modules +set /a count = 0 -FOR /d /r . %%d in (bin,obj, logs, node_modules) DO (( - ECHO.Deleting: %%d - rd /s/q "%%d" - ) - ) -) +echo Deleting all following directories: +for %%d in (%directories%) do echo %%d +echo. -ECHO. -ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit. +FOR /d /r . %%d in (%directories%) DO if exist "%%d" ( + echo. Deleting: %%d + rd /s/q "%%d" + set /a count += 1 + ) + +echo. +echo The specified directories were successfully scanned. +echo Number of deleted directories: %count% +echo Press any key to exit. pause > nul From d7327152f7382d18788bee9a7e2c8831c78187cb Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Mon, 1 Apr 2024 15:41:23 +0330 Subject: [PATCH 03/12] Update delete-temp-directories.bat --- delete-temp-directories.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat index 5921c8f4..967dcb22 100644 --- a/delete-temp-directories.bat +++ b/delete-temp-directories.bat @@ -8,7 +8,7 @@ echo Deleting all following directories: for %%d in (%directories%) do echo %%d echo. -FOR /d /r . %%d in (%directories%) DO if exist "%%d" ( +for /d /r . %%d in (%directories%) do if exist "%%d" ( echo. Deleting: %%d rd /s/q "%%d" set /a count += 1 From 0228e1bb4791cf57d25f7ac9e20cd11fc4c6de13 Mon Sep 17 00:00:00 2001 From: Sajad Afaghiy Date: Sat, 6 Apr 2024 00:26:00 +0330 Subject: [PATCH 04/12] Update delete-temp-directories.bat --- delete-temp-directories.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/delete-temp-directories.bat b/delete-temp-directories.bat index 967dcb22..d9e2badf 100644 --- a/delete-temp-directories.bat +++ b/delete-temp-directories.bat @@ -12,7 +12,7 @@ for /d /r . %%d in (%directories%) do if exist "%%d" ( echo. Deleting: %%d rd /s/q "%%d" set /a count += 1 - ) +) echo. echo The specified directories were successfully scanned. From e9332421dadadddc6dd4b9482659128c68838b20 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 20 May 2024 14:19:02 +0300 Subject: [PATCH 05/12] open helm deploy --- etc/k8s/azure/azure-pipelines.yml | 308 +++++++++++++++--------------- 1 file changed, 154 insertions(+), 154 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index d5273739..f25011e6 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -87,20 +87,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) - # displayName: 'Deploy Angular App' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' - # releaseName: 'administration' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + displayName: 'Deploy Angular App' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' + releaseName: 'administration' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web/values.yaml' + waitForExecution: false # Public Web - task: Docker@2 @@ -123,20 +123,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) - # displayName: 'Deploy Public Web' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web' - # releaseName: 'public-web' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + displayName: 'Deploy Public Web' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web' + releaseName: 'public-web' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web/values.yaml' + waitForExecution: false # Web Gateway - task: Docker@2 @@ -159,20 +159,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) - # displayName: 'Deploy Web Gateway' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web' - # releaseName: 'web-gateway' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + displayName: 'Deploy Web Gateway' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web' + releaseName: 'web-gateway' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web/values.yaml' + waitForExecution: false # Web Public Gateway - task: Docker@2 @@ -195,20 +195,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) - # displayName: 'Deploy Web Public Gateway' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public' - # releaseName: 'web-public-gateway' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + displayName: 'Deploy Web Public Gateway' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public' + releaseName: 'web-public-gateway' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public/values.yaml' + waitForExecution: false # Administration - task: Docker@2 @@ -231,20 +231,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) - # displayName: 'Deploy Administration' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration' - # releaseName: 'administration' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + displayName: 'Deploy Administration' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration' + releaseName: 'administration' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration/values.yaml' + waitForExecution: false # Basket - task: Docker@2 @@ -267,20 +267,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) - # displayName: 'Deploy Basket' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket' - # releaseName: 'basket' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + displayName: 'Deploy Basket' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket' + releaseName: 'basket' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket/values.yaml' + waitForExecution: false # Catalog - task: Docker@2 @@ -303,20 +303,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) - # displayName: 'Deploy Catalog' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog' - # releaseName: 'catalog' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + displayName: 'Deploy Catalog' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog' + releaseName: 'catalog' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog/values.yaml' + waitForExecution: false # cmskit - task: Docker@2 @@ -339,20 +339,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) - # displayName: 'Deploy CmsKit' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit' - # releaseName: 'cmskit' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + displayName: 'Deploy CmsKit' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit' + releaseName: 'cmskit' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit/values.yaml' + waitForExecution: false # Identity - task: Docker@2 @@ -375,20 +375,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) - # displayName: 'Deploy Identity' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity' - # releaseName: 'identity' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + displayName: 'Deploy Identity' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity' + releaseName: 'identity' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity/values.yaml' + waitForExecution: false # Ordering - task: Docker@2 @@ -411,20 +411,20 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) - # displayName: 'Deploy Ordering' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering' - # releaseName: 'ordering' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering/values.yaml' - # waitForExecution: false + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + displayName: 'Deploy Ordering' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering' + releaseName: 'ordering' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering/values.yaml' + waitForExecution: false # Payment - task: Docker@2 @@ -447,17 +447,17 @@ stages: containerRegistry: $(dockerRegistryServiceConnection) tags: | $(tag) - # - task: HelmDeploy@0 - # #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) - # displayName: 'Deploy Payment' - # inputs: - # connectionType: Kubernetes Service Connection - # kubernetesServiceConnection: 'aks-demoms' - # namespace: 'eshop' - # command: 'upgrade' - # hartType: 'FilePath' - # chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment' - # releaseName: 'payment' - # overrideValues: 'image.tag=$(tag)' - # valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment/values.yaml' - # waitForExecution: false \ No newline at end of file + - task: HelmDeploy@0 + #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + displayName: 'Deploy Payment' + inputs: + connectionType: Kubernetes Service Connection + kubernetesServiceConnection: 'aks-demoms' + namespace: 'eshop' + command: 'upgrade' + hartType: 'FilePath' + chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment' + releaseName: 'payment' + overrideValues: 'image.tag=$(tag)' + valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment/values.yaml' + waitForExecution: false \ No newline at end of file From 3df5a52a36beaee4d0239342338344cc3027e358 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 20 May 2024 15:16:23 +0300 Subject: [PATCH 06/12] eshoponabp-charts --- etc/k8s/azure/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index f25011e6..07bcbd24 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -22,7 +22,7 @@ resources: type: github endpoint: github.com_skoc10 name: volosoft/devops - ref: master + ref: eshoponabp-charts variables: dockerRegistryServiceConnection: 'volosoft-reg' From 341effdbd641c1a879e6d4b1170978c1e00a31d0 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 20 May 2024 15:23:45 +0300 Subject: [PATCH 07/12] chartType: 'FilePath' --- etc/k8s/azure/azure-pipelines.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index 07bcbd24..bef18323 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -95,7 +95,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' releaseName: 'administration' overrideValues: 'image.tag=$(tag)' @@ -131,7 +131,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/public-web' releaseName: 'public-web' overrideValues: 'image.tag=$(tag)' @@ -167,7 +167,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web' releaseName: 'web-gateway' overrideValues: 'image.tag=$(tag)' @@ -203,7 +203,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/gateway-web-public' releaseName: 'web-public-gateway' overrideValues: 'image.tag=$(tag)' @@ -239,7 +239,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/administration' releaseName: 'administration' overrideValues: 'image.tag=$(tag)' @@ -275,7 +275,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/basket' releaseName: 'basket' overrideValues: 'image.tag=$(tag)' @@ -311,7 +311,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/catalog' releaseName: 'catalog' overrideValues: 'image.tag=$(tag)' @@ -347,7 +347,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/cmskit' releaseName: 'cmskit' overrideValues: 'image.tag=$(tag)' @@ -383,7 +383,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/identity' releaseName: 'identity' overrideValues: 'image.tag=$(tag)' @@ -419,7 +419,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/ordering' releaseName: 'ordering' overrideValues: 'image.tag=$(tag)' @@ -455,7 +455,7 @@ stages: kubernetesServiceConnection: 'aks-demoms' namespace: 'eshop' command: 'upgrade' - hartType: 'FilePath' + chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/payment' releaseName: 'payment' overrideValues: 'image.tag=$(tag)' From 865bc79e28fe9aff5bd2c932edbdf0983e2b81e3 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Mon, 20 May 2024 16:01:26 +0300 Subject: [PATCH 08/12] fix web release name --- etc/k8s/azure/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index bef18323..fcb858cd 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -97,7 +97,7 @@ stages: command: 'upgrade' chartType: 'FilePath' chartPath: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web' - releaseName: 'administration' + releaseName: 'web' overrideValues: 'image.tag=$(tag)' valueFile: 'devops/eshoponabp/k8s/eshoponabp-istio/charts/web/values.yaml' waitForExecution: false From 4dcb43726d0164fc29015b9d11805feaca639244 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Mon, 20 May 2024 23:10:10 -0400 Subject: [PATCH 09/12] fixes the exception loop handling --- .../UserLoggedInEventHandler.cs | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs b/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs index 058db2d8..075b1283 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs +++ b/services/identity/src/EShopOnAbp.IdentityService.Application/UserLoggedInEventHandler.cs @@ -1,8 +1,11 @@ -using System.Threading.Tasks; +using System.Linq; +using System.Threading.Tasks; using EShopOnAbp.IdentityService.ETOs; +using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories; using Volo.Abp.EventBus.Distributed; using Volo.Abp.Identity; using Volo.Abp.Uow; @@ -13,16 +16,22 @@ public class UserLoggedInEventHandler : IDistributedEventHandler _logger; + private readonly IIdentityUserRepository _identityUserRepository; + private readonly ILookupNormalizer _lookupNormalizer; - public UserLoggedInEventHandler(IdentityUserManager userManager, ILogger logger) + public UserLoggedInEventHandler(IdentityUserManager userManager, + ILogger logger, + IIdentityUserRepository identityUserRepository, + ILookupNormalizer lookupNormalizer) { _userManager = userManager; _logger = logger; + _identityUserRepository = identityUserRepository; + _lookupNormalizer = lookupNormalizer; } - - + [UnitOfWork] - public async virtual Task HandleEventAsync(UserLoggedInEto eventData) + public virtual async Task HandleEventAsync(UserLoggedInEto eventData) { if (eventData == null) { @@ -59,8 +68,15 @@ public class UserLoggedInEventHandler : IDistributedEventHandler Date: Tue, 21 May 2024 10:22:13 +0300 Subject: [PATCH 10/12] #condition opened --- etc/k8s/azure/azure-pipelines.yml | 66 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index fcb858cd..f8711f8a 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -69,7 +69,7 @@ stages: # Angular App - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Build Angular App' inputs: command: build @@ -79,7 +79,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Push Angular App' inputs: command: push @@ -88,7 +88,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Deploy Angular App' inputs: connectionType: Kubernetes Service Connection @@ -104,7 +104,7 @@ stages: # Public Web - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Build Public Web' inputs: command: build @@ -115,7 +115,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Push Public Web' inputs: command: push @@ -124,7 +124,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Deploy Public Web' inputs: connectionType: Kubernetes Service Connection @@ -140,7 +140,7 @@ stages: # Web Gateway - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Build Web Gateway' inputs: command: build @@ -151,7 +151,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Push Web Gateway' inputs: command: push @@ -160,7 +160,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Deploy Web Gateway' inputs: connectionType: Kubernetes Service Connection @@ -176,7 +176,7 @@ stages: # Web Public Gateway - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Build Web Public Gateway' inputs: command: build @@ -187,7 +187,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Push Web Public Gateway' inputs: command: push @@ -196,7 +196,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Deploy Web Public Gateway' inputs: connectionType: Kubernetes Service Connection @@ -212,7 +212,7 @@ stages: # Administration - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Build Administration' inputs: command: build @@ -223,7 +223,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Push Administration' inputs: command: push @@ -232,7 +232,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Deploy Administration' inputs: connectionType: Kubernetes Service Connection @@ -248,7 +248,7 @@ stages: # Basket - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Build Basket' inputs: command: build @@ -259,7 +259,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Push Basket' inputs: command: push @@ -268,7 +268,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Deploy Basket' inputs: connectionType: Kubernetes Service Connection @@ -284,7 +284,7 @@ stages: # Catalog - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Build Catalog' inputs: command: build @@ -295,7 +295,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Push Catalog' inputs: command: push @@ -304,7 +304,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Deploy Catalog' inputs: connectionType: Kubernetes Service Connection @@ -320,7 +320,7 @@ stages: # cmskit - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Build CmsKit' inputs: command: build @@ -331,7 +331,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Push CmsKit' inputs: command: push @@ -340,7 +340,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Deploy CmsKit' inputs: connectionType: Kubernetes Service Connection @@ -356,7 +356,7 @@ stages: # Identity - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Build Identity' inputs: command: build @@ -367,7 +367,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Push Identity' inputs: command: push @@ -376,7 +376,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Deploy Identity' inputs: connectionType: Kubernetes Service Connection @@ -392,7 +392,7 @@ stages: # Ordering - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Build Ordering' inputs: command: build @@ -403,7 +403,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Push Ordering' inputs: command: push @@ -412,7 +412,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Deploy Ordering' inputs: connectionType: Kubernetes Service Connection @@ -428,7 +428,7 @@ stages: # Payment - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Build Payment' inputs: command: build @@ -439,7 +439,7 @@ stages: tags: | $(tag) - task: Docker@2 - #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Push Payment' inputs: command: push @@ -448,7 +448,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Deploy Payment' inputs: connectionType: Kubernetes Service Connection From b223ba2fc39469039c6170ee0fcce19e3b6b355e Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 21 May 2024 16:05:49 +0300 Subject: [PATCH 11/12] cancel path trigger --- etc/k8s/azure/azure-pipelines.yml | 66 +++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index f8711f8a..fcb858cd 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -69,7 +69,7 @@ stages: # Angular App - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Build Angular App' inputs: command: build @@ -79,7 +79,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Push Angular App' inputs: command: push @@ -88,7 +88,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAngular'], 'true')) displayName: 'Deploy Angular App' inputs: connectionType: Kubernetes Service Connection @@ -104,7 +104,7 @@ stages: # Public Web - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Build Public Web' inputs: command: build @@ -115,7 +115,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Push Public Web' inputs: command: push @@ -124,7 +124,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPublicWeb'], 'true')) displayName: 'Deploy Public Web' inputs: connectionType: Kubernetes Service Connection @@ -140,7 +140,7 @@ stages: # Web Gateway - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Build Web Gateway' inputs: command: build @@ -151,7 +151,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Push Web Gateway' inputs: command: push @@ -160,7 +160,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebGateway'], 'true')) displayName: 'Deploy Web Gateway' inputs: connectionType: Kubernetes Service Connection @@ -176,7 +176,7 @@ stages: # Web Public Gateway - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Build Web Public Gateway' inputs: command: build @@ -187,7 +187,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Push Web Public Gateway' inputs: command: push @@ -196,7 +196,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedWebPublicGateway'], 'true')) displayName: 'Deploy Web Public Gateway' inputs: connectionType: Kubernetes Service Connection @@ -212,7 +212,7 @@ stages: # Administration - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Build Administration' inputs: command: build @@ -223,7 +223,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Push Administration' inputs: command: push @@ -232,7 +232,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedAdministration'], 'true')) displayName: 'Deploy Administration' inputs: connectionType: Kubernetes Service Connection @@ -248,7 +248,7 @@ stages: # Basket - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Build Basket' inputs: command: build @@ -259,7 +259,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Push Basket' inputs: command: push @@ -268,7 +268,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedBasket'], 'true')) displayName: 'Deploy Basket' inputs: connectionType: Kubernetes Service Connection @@ -284,7 +284,7 @@ stages: # Catalog - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Build Catalog' inputs: command: build @@ -295,7 +295,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Push Catalog' inputs: command: push @@ -304,7 +304,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCatalog'], 'true')) displayName: 'Deploy Catalog' inputs: connectionType: Kubernetes Service Connection @@ -320,7 +320,7 @@ stages: # cmskit - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Build CmsKit' inputs: command: build @@ -331,7 +331,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Push CmsKit' inputs: command: push @@ -340,7 +340,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedCmsKit'], 'true')) displayName: 'Deploy CmsKit' inputs: connectionType: Kubernetes Service Connection @@ -356,7 +356,7 @@ stages: # Identity - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Build Identity' inputs: command: build @@ -367,7 +367,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Push Identity' inputs: command: push @@ -376,7 +376,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedIdentity'], 'true')) displayName: 'Deploy Identity' inputs: connectionType: Kubernetes Service Connection @@ -392,7 +392,7 @@ stages: # Ordering - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Build Ordering' inputs: command: build @@ -403,7 +403,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Push Ordering' inputs: command: push @@ -412,7 +412,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedOrdering'], 'true')) displayName: 'Deploy Ordering' inputs: connectionType: Kubernetes Service Connection @@ -428,7 +428,7 @@ stages: # Payment - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Build Payment' inputs: command: build @@ -439,7 +439,7 @@ stages: tags: | $(tag) - task: Docker@2 - condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Push Payment' inputs: command: push @@ -448,7 +448,7 @@ stages: tags: | $(tag) - task: HelmDeploy@0 - condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) + #condition: and(succeeded(), eq(variables['hasChangedPayment'], 'true')) displayName: 'Deploy Payment' inputs: connectionType: Kubernetes Service Connection From c93836daaeac9af2bf8047b2830ca165cbdfb641 Mon Sep 17 00:00:00 2001 From: selmankoc Date: Tue, 21 May 2024 16:13:55 +0300 Subject: [PATCH 12/12] fix branch name --- etc/k8s/azure/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/k8s/azure/azure-pipelines.yml b/etc/k8s/azure/azure-pipelines.yml index fcb858cd..f5c78b6a 100644 --- a/etc/k8s/azure/azure-pipelines.yml +++ b/etc/k8s/azure/azure-pipelines.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - skoc/azure-pipeline + - main paths: include: - apps/angular/src/** @@ -22,7 +22,7 @@ resources: type: github endpoint: github.com_skoc10 name: volosoft/devops - ref: eshoponabp-charts + ref: master variables: dockerRegistryServiceConnection: 'volosoft-reg'