Added nested edge long haul pipeline script (#4333)

* added nested edge long haul test script * fixed cleanup * fixed cleanup * fixed nested long haul deployment template * rebase master * modified to use internal IP as parent host name * fixed and removed incorrect/deprecated keys in long haul deploy config * fixed missing nested long haul env variable * modified device id * fixed trcE2ETest.sh * fixed nested long haul script * fixed to download latest build artifacts * workaround Nuget Security Analysis error * workaround Nuget Security Analysis error * enabled clean up for pipeline test * remove workaround for Nuget Security Analysis * workaround Nuget Security Analysis error * workaround Nuget Security Analysis error * remove workaround for Nuget Security Analysis
Azure · Feb 9, 2021 · bce05fd · bce05fd
1 parent 7701250
commit bce05fd
Show file tree

Hide file tree

Showing 15 changed files with 817 additions and 532 deletions.
diff --git a/builds/e2e/nested-connectivity.yaml b/builds/e2e/nested-connectivity.yaml
@@ -102,7 +102,7 @@ jobs:
         inputs:
           azureSubscription: $(azure.subscription)
           KeyVaultName: edgebuildkv
-          SecretsFilter: 'ConnectivityNestedEdge-ConnectionString,ConnectivityNestedEdge-EventHubConnectionString'
+          SecretsFilter: 'IotHubStressConnString,EventHubStressConnStr'
       - task: DownloadBuildArtifacts@0
         condition: and(succeeded(), eq(variables['run.flag'], 1))
         displayName: 'Download Edgelet Artifacts'
@@ -146,8 +146,8 @@ jobs:
           container.registry: '$(container.registry)'
           container.registry.username: '$(edgebuilds-azurecr-io-username)'
           container.registry.password: '$(edgebuilds-azurecr-io-pwd)'
-          iotHub.connectionString: '$(ConnectivityNestedEdge-ConnectionString)'
-          eventHub.connectionString: '$(ConnectivityNestedEdge-EventHubConnectionString)'
+          iotHub.connectionString: '$(IotHubStressConnString)'
+          eventHub.connectionString: '$(EventHubStressConnStr)'
           deploymentFileName: '$(deploymentFileName)'
           upstream.protocol: '$(upstream.protocol)'
           loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'

diff --git a/builds/e2e/nested-e2e.yaml b/builds/e2e/nested-e2e.yaml
@@ -13,64 +13,7 @@ resources:
 stages:
 - stage: SetupVM
   jobs:
-  - job: SetupVM_level5
-    displayName: SettingUp level 5
-    timeoutInMinutes: 180
-    variables:
-      artifactName: iotedged-ubuntu18.04-amd64
-      identityServiceArtifactName: packages_ubuntu-18.04_amd64
-      identityServicePackageFilter: aziot-identity-service_*_amd64.deb
-      vsts.project: $(System.TeamProjectId)
-      level: '5'
-      deploymentFile: 'nestededge_topLayerBaseDeployment.json'
-      parentName: ''
-      parentDeviceId: ''
-    pool:
-     name: $(pool.name)
-     demands:
-       - agent-group -equals $(agent.group)
-       - Agent.OS -equals Linux
-       - Agent.OSArchitecture -equals X64
-       - run-idle -equals true
-       - status -equals unlocked
-    steps:
-     - template: templates/nested-get-secrets.yaml
-     - template: templates/e2e-clean-directory.yaml            
-     - template: templates/lock-test-agent.yaml
-     - template: templates/nested-get-root-ca.yaml       
-     - template: templates/nested-create-identity.yaml   
-     - template: templates/nested-agent-deploy.yaml
-
-  - job: SetupVM_level4
-    dependsOn: SetupVM_level5
-    displayName: SettingUp level 4
-    condition: succeeded()
-    timeoutInMinutes: 180
-    variables:
-      identityServiceArtifactName: packages_ubuntu-18.04_amd64
-      identityServicePackageFilter: aziot-identity-service_*_amd64.deb   
-      artifactName: iotedged-ubuntu18.04-amd64
-      vsts.project: $(System.TeamProjectId)
-      parentName: $[ dependencies.SetupVM_level5.outputs['deployIoTEdge.deviceName'] ]
-      parentDeviceId: $[ dependencies.SetupVM_level5.outputs['createIdentity.parentDeviceId'] ] 
-      deploymentFile: 'nestededge_middleLayerBaseDeployment.json'
-      level: '4'
-    pool:
-     name: $(pool.name)
-     demands:
-       - agent-group -equals $(agent.group)
-       - Agent.OS -equals Linux
-       - Agent.OSArchitecture -equals X64
-       - run-idle -equals true 
-       - status -equals unlocked    
-    steps:
-      - template: templates/nested-get-secrets.yaml  
-      - template: templates/e2e-clean-directory.yaml                
-      - template: templates/lock-test-agent.yaml
-      - template: templates/nested-get-root-ca.yaml         
-      - template: templates/nested-create-identity.yaml          
-      - template: templates/nested-agent-deploy.yaml
-
+  - template: templates/nested-parent-vm-setup.yaml
   - job:  SetupVM_and_RunTest_level3
     dependsOn: SetupVM_level4
     displayName: Set up and run tests
@@ -91,7 +34,6 @@ stages:
         - agent-group -equals $(agent.group)
         - Agent.OS -equals Linux
         - Agent.OSArchitecture -equals X64
-        - run-idle -equals true 
         - status -equals unlocked    
     steps:   
       - template: templates/nested-get-secrets.yaml     
@@ -103,8 +45,8 @@ stages:
       - template: templates/e2e-clear-docker-cached-images.yaml
       - template: templates/e2e-run.yaml
         parameters:
-          EventHubCompatibleEndpoint: $(ConnectivityNestedEdge-EventHubConnectionString)
-          IotHubConnectionString: $(ConnectivityNestedEdge-ConnectionString)
+          EventHubCompatibleEndpoint: $(EventHubStressConnStr)
+          IotHubConnectionString: $(IotHubStressConnString)
 
   - job:  Clean_up     
     dependsOn:
@@ -121,14 +63,13 @@ stages:
       deviceLvl4IoTHubName: $[ dependencies.SetupVM_level4.outputs['createIdentity.iotHubName'] ]
       deviceLvl5AgentName: $[ dependencies.SetupVM_level5.outputs['lock_test_agent.agentName'] ]         
       deviceLvl4AgentName: $[ dependencies.SetupVM_level4.outputs['lock_test_agent.agentName'] ]       
-      deviceLvl3AgentName: $[ dependencies.SetupVM_level3.outputs['lock_test_agent.agentName'] ]  
+      deviceLvl3AgentName: $[ dependencies.SetupVM_and_RunTest_level3.outputs['lock_test_agent.agentName'] ]  
     pool:
       name: $(pool.name)
       demands:
         - agent-group -equals $(agent.group)
         - Agent.OS -equals Linux
         - Agent.OSArchitecture -equals X64
-        - run-idle -equals true 
         - status -equals unlocked_$(Build.BuildId)          
     steps:
       - template: templates/nested-get-secrets.yaml  

diff --git a/builds/e2e/nested-edge-longhaul.yaml b/builds/e2e/nested-edge-longhaul.yaml