From 32220e3d09771b940ff40c3a213441f4eece3760 Mon Sep 17 00:00:00 2001 From: Vamsi Kalapala Date: Fri, 9 Sep 2022 16:15:50 -0700 Subject: [PATCH 1/3] fix: [NPM] cyclonus latest pipeline cleanup issue --- .pipelines/npm/npm-cyc-win-tests-latest-release.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml index 9290c7c562..37972ba634 100644 --- a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml +++ b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml @@ -73,7 +73,7 @@ jobs: az feature register --namespace Microsoft.ContainerService --name AKSWindows2022Preview az provider register -n Microsoft.ContainerService - export CLUSTER_NAME=$(RESOURCE_GROUP)-$(PROFILE) + export CLUSTER_NAME=$(RESOURCE_GROUP) echo "Creating resource group named $CLUSTER_NAME" az group create --name $CLUSTER_NAME -l $(LOCATION) -o table diff --git a/Makefile b/Makefile index 7ed48a089c..b7c99e333e 100644 --- a/Makefile +++ b/Makefile @@ -368,7 +368,7 @@ npm-image-windows: ## build the npm container windows image. $(MKDIR) $(IMAGE_DIR); docker build \ --no-cache \ - -f cns/windows.Dockerfile \ + -f npm/windows.Dockerfile \ -t $(IMAGE_REGISTRY)/$(NPM_IMAGE)-win:$(NPM_PLATFORM_TAG) \ --build-arg VERSION=$(NPM_VERSION) \ --build-arg NPM_AI_PATH=$(NPM_AI_PATH) \ From a0e40476b5cb102e3f3e99e0cccc5f77e8160894 Mon Sep 17 00:00:00 2001 From: Vamsi Kalapala Date: Fri, 9 Sep 2022 16:19:00 -0700 Subject: [PATCH 2/3] fix: [NPM] cyclonus latest pipeline cleanup issue --- .pipelines/npm/npm-cyc-win-tests-latest-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml index 37972ba634..395c9e7f68 100644 --- a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml +++ b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml @@ -178,7 +178,7 @@ jobs: ./test/cyclonus/test-cyclonus-windows.sh name: cyclonus displayName: "Run Cyclonus Test" - failOnStderr: false + failOnStderr: true condition: always() - bash: | From 4d9bf4a7d59bdc4dfee97cebc28e8d7a4e403e3d Mon Sep 17 00:00:00 2001 From: Vamsi Kalapala Date: Fri, 9 Sep 2022 16:19:14 -0700 Subject: [PATCH 3/3] fix: [NPM] cyclonus latest pipeline cleanup issue --- .pipelines/npm/npm-cyc-win-tests-latest-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml index 395c9e7f68..37972ba634 100644 --- a/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml +++ b/.pipelines/npm/npm-cyc-win-tests-latest-release.yaml @@ -178,7 +178,7 @@ jobs: ./test/cyclonus/test-cyclonus-windows.sh name: cyclonus displayName: "Run Cyclonus Test" - failOnStderr: true + failOnStderr: false condition: always() - bash: |