From 9528f39984a763bd89bcb099ef83ab8797a4f18a Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 25 Aug 2023 15:10:51 -0700 Subject: [PATCH 1/4] test: continue on fail --- .../dualstack-overlay/dualstackoverlay-e2e-job-template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml index 16c72062d9..9038b4cd82 100644 --- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml +++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml @@ -31,6 +31,7 @@ stages: region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement - stage: ${{ parameters.name }} + condition: succeededOrFailed() displayName: E2E - ${{ parameters.displayName }} dependsOn: - setup From c7894d1c386200135c1d17ef67102cccdf62eae4 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 25 Aug 2023 15:47:14 -0700 Subject: [PATCH 2/4] test: continueOnError --- .../dualstack-overlay/dualstackoverlay-e2e-job-template.yaml | 2 +- .pipelines/templates/create-cluster.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml index 9038b4cd82..c7351df13b 100644 --- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml +++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml @@ -31,7 +31,7 @@ stages: region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement - stage: ${{ parameters.name }} - condition: succeededOrFailed() + condition: and( succeeded(), not(eq(dependencies.dualstackoverlaye2e.result,'SucceededWithIssues')) ) # Cant use parameters in dependencies displayName: E2E - ${{ parameters.displayName }} dependsOn: - setup diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 0ba0f03623..31b15b4bfb 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -34,3 +34,4 @@ jobs: make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) CLUSTER=${{ parameters.clusterName }} K8S_VER=${{ parameters.k8sVersion }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_OS_SKU=${{ parameters.windowsOsSku }} WINDOWS_VM_SKU=${{ parameters.vmSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} echo "Cluster successfully created" displayName: Cluster - ${{ parameters.clusterType }} + continueOnError: ${{ contains(parameters.clusterType, 'dualstack') }} From 183e56f0f32aaa70221b0effb8ca2042113ba920 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 25 Aug 2023 16:04:34 -0700 Subject: [PATCH 3/4] test: succeed cluster creation --- .../dualstackoverlay-e2e-job-template.yaml | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml index c7351df13b..7fc6c1279f 100644 --- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml +++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml @@ -19,16 +19,26 @@ stages: variables: commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ] jobs: - - template: ../../templates/create-cluster.yaml - parameters: - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - clusterType: ${{ parameters.clusterType }} - clusterName: ${{ parameters.clusterName }}-$(commitID) - vmSize: ${{ parameters.vmSize }} - k8sVersion: ${{ parameters.k8sVersion }} - dependsOn: ${{ parameters.dependsOn }} - region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement + - job: temp + pool: + name: "$(BUILD_POOL_NAME_DEFAULT)" + steps: + - script: | + # To use the variables below, you must make the respective stage's dependsOn have - setup or it will not retain context of this stage + echo you did it + name: "EnvironmentalVariables" + displayName: "Set environmental variables" + + # - template: ../../templates/create-cluster.yaml + # parameters: + # name: ${{ parameters.name }} + # displayName: ${{ parameters.displayName }} + # clusterType: ${{ parameters.clusterType }} + # clusterName: ${{ parameters.clusterName }}-$(commitID) + # vmSize: ${{ parameters.vmSize }} + # k8sVersion: ${{ parameters.k8sVersion }} + # dependsOn: ${{ parameters.dependsOn }} + # region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement - stage: ${{ parameters.name }} condition: and( succeeded(), not(eq(dependencies.dualstackoverlaye2e.result,'SucceededWithIssues')) ) # Cant use parameters in dependencies From 7168205d8f6f892e4c0231cf62bb4d152f2624da Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 25 Aug 2023 16:21:00 -0700 Subject: [PATCH 4/4] revert commented job --- .../dualstackoverlay-e2e-job-template.yaml | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml index 7fc6c1279f..c7351df13b 100644 --- a/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml +++ b/.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml @@ -19,26 +19,16 @@ stages: variables: commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ] jobs: - - job: temp - pool: - name: "$(BUILD_POOL_NAME_DEFAULT)" - steps: - - script: | - # To use the variables below, you must make the respective stage's dependsOn have - setup or it will not retain context of this stage - echo you did it - name: "EnvironmentalVariables" - displayName: "Set environmental variables" - - # - template: ../../templates/create-cluster.yaml - # parameters: - # name: ${{ parameters.name }} - # displayName: ${{ parameters.displayName }} - # clusterType: ${{ parameters.clusterType }} - # clusterName: ${{ parameters.clusterName }}-$(commitID) - # vmSize: ${{ parameters.vmSize }} - # k8sVersion: ${{ parameters.k8sVersion }} - # dependsOn: ${{ parameters.dependsOn }} - # region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement + - template: ../../templates/create-cluster.yaml + parameters: + name: ${{ parameters.name }} + displayName: ${{ parameters.displayName }} + clusterType: ${{ parameters.clusterType }} + clusterName: ${{ parameters.clusterName }}-$(commitID) + vmSize: ${{ parameters.vmSize }} + k8sVersion: ${{ parameters.k8sVersion }} + dependsOn: ${{ parameters.dependsOn }} + region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement - stage: ${{ parameters.name }} condition: and( succeeded(), not(eq(dependencies.dualstackoverlaye2e.result,'SucceededWithIssues')) ) # Cant use parameters in dependencies