Skip to content

Commit 7104277

Browse files
authored
Longw/update arc pipeline (#1461)
* Update ci-arc-k8s-extension-prod-release.yaml for Azure Pipelines * exclude scantelemetry
1 parent 6fc9f09 commit 7104277

File tree

2 files changed

+42
-8
lines changed

2 files changed

+42
-8
lines changed

.pipelines/azure_pipeline_mergedbranches.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ extends:
111111
SourceFolder: "$(Build.SourcesDirectory)/deployment"
112112
Contents: |
113113
**/*
114+
!**/ScanTelemetry_*.json
114115
TargetFolder: '$(Build.ArtifactStagingDirectory)/build'
115116
- task: CopyFiles@2
116117
displayName: "Copy ev2 deployment scripts"

.pipelines/ci-arc-k8s-extension-prod-release.yaml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ stages:
527527
ServiceRootLocation: LinkedArtifact
528528
RolloutSpecType: RSPath
529529
ServiceRootPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot
530-
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/Public.Stable.RolloutSpec.json
530+
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot/RolloutSpecs/Public.Stable.RolloutSpec.json
531531
OutputRolloutId: RolloutId
532532
OutputServiceGroupName: ServiceGroupName
533533
OutputRolloutStatus: RolloutStatus
@@ -566,10 +566,21 @@ stages:
566566
displayName: Ev2 - Monitoring
567567
inputs:
568568
Ev2MonintoringUrl: $(Ev2MonintoringUrl)
569+
- stage: Wait_After_Stage_2
570+
displayName: Wait after Pilot Region
571+
dependsOn: Stage_2
572+
jobs:
573+
- job: WaitJob
574+
displayName: Wait for Bake Time
575+
pool: server
576+
steps:
577+
- task: Delay@1
578+
inputs:
579+
delayForMinutes: 1500
569580
- stage: Stage_3
570581
displayName: Light Load Region
571582
dependsOn:
572-
- Stage_2
583+
- Wait_After_Stage_2
573584
pool:
574585
name: Azure-Pipelines-Windows-CI-Test-EO
575586
os: windows
@@ -791,7 +802,7 @@ stages:
791802
ServiceRootLocation: LinkedArtifact
792803
RolloutSpecType: RSPath
793804
ServiceRootPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot
794-
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/Public.Stable.RolloutSpec.json
805+
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot/RolloutSpecs/Public.Stable.RolloutSpec.json
795806
OutputRolloutId: RolloutId
796807
OutputServiceGroupName: ServiceGroupName
797808
OutputRolloutStatus: RolloutStatus
@@ -830,10 +841,21 @@ stages:
830841
displayName: Ev2 - Monitoring
831842
inputs:
832843
Ev2MonintoringUrl: $(Ev2MonintoringUrl)
844+
- stage: Wait_After_Stage_3
845+
displayName: Wait after Light Load Region
846+
dependsOn: Stage_3
847+
jobs:
848+
- job: WaitJob
849+
displayName: Wait for Bake Time
850+
pool: server
851+
steps:
852+
- task: Delay@1
853+
inputs:
854+
delayForMinutes: 1500
833855
- stage: Stage_4
834856
displayName: Medium Load Region
835857
dependsOn:
836-
- Stage_3
858+
- Wait_After_Stage_3
837859
pool:
838860
name: Azure-Pipelines-Windows-CI-Test-EO
839861
os: windows
@@ -1055,7 +1077,7 @@ stages:
10551077
ServiceRootLocation: LinkedArtifact
10561078
RolloutSpecType: RSPath
10571079
ServiceRootPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot
1058-
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/Public.Stable.RolloutSpec.json
1080+
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot/RolloutSpecs/Public.Stable.RolloutSpec.json
10591081
OutputRolloutId: RolloutId
10601082
OutputServiceGroupName: ServiceGroupName
10611083
OutputRolloutStatus: RolloutStatus
@@ -1094,10 +1116,21 @@ stages:
10941116
displayName: Ev2 - Monitoring
10951117
inputs:
10961118
Ev2MonintoringUrl: $(Ev2MonintoringUrl)
1119+
- stage: Wait_After_Stage_4
1120+
displayName: Wait after Medium Load Region
1121+
dependsOn: Stage_4
1122+
jobs:
1123+
- job: WaitJob
1124+
displayName: Wait for Bake Time
1125+
pool: server
1126+
steps:
1127+
- task: Delay@1
1128+
inputs:
1129+
delayForMinutes: 1500
10971130
- stage: Stage_5
10981131
displayName: High Load Region
10991132
dependsOn:
1100-
- Stage_4
1133+
- Wait_After_Stage_4
11011134
pool:
11021135
name: Azure-Pipelines-Windows-CI-Test-EO
11031136
os: windows
@@ -1319,7 +1352,7 @@ stages:
13191352
ServiceRootLocation: LinkedArtifact
13201353
RolloutSpecType: RSPath
13211354
ServiceRootPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot
1322-
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/Public.Stable.RolloutSpec.json
1355+
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot/RolloutSpecs/Public.Stable.RolloutSpec.json
13231356
OutputRolloutId: RolloutId
13241357
OutputServiceGroupName: ServiceGroupName
13251358
OutputRolloutStatus: RolloutStatus
@@ -1606,7 +1639,7 @@ stages:
16061639
ServiceRootLocation: LinkedArtifact
16071640
RolloutSpecType: RSPath
16081641
ServiceRootPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot
1609-
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/Public.Stable.RolloutSpec.json
1642+
RolloutSpecPath: $(Pipeline.Workspace)/ev2Artifact/drop/build/arc-k8s-extension-release-v2/ServiceGroupRoot/RolloutSpecs/Public.Stable.RolloutSpec.json
16101643
OutputRolloutId: RolloutId
16111644
OutputServiceGroupName: ServiceGroupName
16121645
OutputRolloutStatus: RolloutStatus

0 commit comments

Comments
 (0)