Cherry pick: Azure#4708 Azure#4979 (Azure#5019)

The goal of this PR is to cherry pick: Longhaul Arm: Decrease frequency of test events on arm (Azure#4979) But in order to do this I needed denis' one liner that was never ported: Change default direct method sender interval to 10s (Azure#4708)
snandan18 · May 27, 2021 · 0a7e655 · 0a7e655
1 parent 1947aea
commit 0a7e655
Show file tree

Hide file tree

Showing 18 changed files with 111 additions and 125 deletions.
diff --git a/builds/e2e/connectivity.yaml b/builds/e2e/connectivity.yaml
@@ -186,7 +186,6 @@ jobs:
           eventHub.connectionString: '$(IotHub-EventHubConnStr)'
           deploymentFileName: '$(deploymentFileName)'
           upstream.protocol: '$(upstream.protocol)'
-          loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
           edgeHubRestartTest.restartPeriod: '$(edgeHubRestartTest.restartPeriod)'
           edgeHubRestartTest.sdkOperationTimeout: '$(edgeHubRestartTest.sdkOperationTimeout)'
           testDuration: '$(testrun.duration)'
@@ -367,7 +366,6 @@ jobs:
           eventHub.connectionString: '$(EdgeConnectivityEventHubARM32ConnString)'
           deploymentFileName: '$(deploymentFileName)'
           upstream.protocol: '$(upstream.protocol)'
-          loadGen.message.frequency: '$(loadGen.message.frequency.arm32)'
           edgeHubRestartTest.restartPeriod: '$(edgeHubRestartTest.restartPeriod)'
           edgeHubRestartTest.sdkOperationTimeout: '$(edgeHubRestartTest.sdkOperationTimeout)'
           testDuration: '$(testrun.duration)'

diff --git a/builds/e2e/longhaul.yaml b/builds/e2e/longhaul.yaml
@@ -18,17 +18,13 @@ variables:
   #test.startDelay.amd
   #edgelet.package.branchName
   #images.branchName
-  #loadGen.message.frequency.amd64: 'xx:xx:xx.xx'
-  #loadGen.message.frequency.arm32v7: 'xx:xx:xx.xx'
-  #loadGen.message.frequency.arm64v8: 'xx:xx:xx.xx'
   #run.linux.amd64.moby: 'true/false'
   #run.linux.arm32v7.moby: 'true/false'
   #run.linux.arm64v8.docker: 'true/false'
   #longhaul.desiredModulesToRestartCSV: ''
   #longhaul.restartIntervalInMins: ''
   #longHaul.sendReportFrequency: 'xx:xx:xx.xx'
   #twinTester.twinUpdateSize: ''
-  #twinTester.twinUpdateFrequency: 'xx:xx:xx.xx'
   #twinTester.twinUpdateFailureThreshold: 'xx:xx:xx.xx'
   #twinTester.edgeHubRestartFailureTolerance: 'xx:xx:xx.xx'
   #metricsCollector.metricsEndpointsCSV
@@ -143,7 +139,6 @@ jobs:
           snitch.alert.url: '$(SnitchLongHaulAlertUrl)'
           snitch.storage.account: '$(snitch.storage.account)'
           snitch.storage.masterKey: '$(StorageAccountMasterKeyStress)'
-          loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
           longHaul.desiredModulesToRestartCSV: '$(longHaul.desiredModulesToRestartCSV)'
           longHaul.restartIntervalInMins: '$(longHaul.restartIntervalInMins)'
           longHaul.sendReportFrequency: '$(longHaul.sendReportFrequency)'
@@ -153,7 +148,6 @@ jobs:
           logAnalytics.sharedKey: '$(kvLogAnalyticSharedKey)'
           logAnalytics.logType: '$(logAnalyticsLogType)'
           twinTester.twinUpdateSize: '$(twinTester.twinUpdateSize)'
-          twinTester.twinUpdateFrequency: '$(twinTester.twinUpdateFrequency)'
           twinTester.twinUpdateFailureThreshold: '$(twinTester.twinUpdateFailureThreshold)'
           twinTester.edgeHubRestartFailureTolerance: '$(twinTester.edgeHubRestartFailureTolerance)'
           metricsCollector.metricsEndpointsCSV: '$(metricsCollector.metricsEndpointsCSV)'
@@ -272,7 +266,6 @@ jobs:
           snitch.alert.url: '$(SnitchLongHaulAlertUrl)'
           snitch.storage.account: '$(snitch.storage.account)'
           snitch.storage.masterKey: '$(StorageAccountMasterKeyStress)'
-          loadGen.message.frequency: '$(loadGen.message.frequency.arm32v7)'
           longHaul.desiredModulesToRestartCSV: '$(longHaul.desiredModulesToRestartCSV)'
           longHaul.restartIntervalInMins: '$(longHaul.restartIntervalInMins)'
           longHaul.sendReportFrequency: '$(longHaul.sendReportFrequency)'
@@ -282,8 +275,6 @@ jobs:
           logAnalytics.sharedKey: '$(kvLogAnalyticSharedKey)'
           logAnalytics.logType: '$(logAnalyticsLogType)'
           twinTester.twinUpdateSize: '$(twinTester.twinUpdateSize)'
-          twinTester.twinUpdateFrequency: '$(twinTester.twinUpdateFrequency)'
-          twinTester.twinUpdateFailureThreshold: '$(twinTester.twinUpdateFailureThreshold)'
           twinTester.edgeHubRestartFailureTolerance: '$(twinTester.edgeHubRestartFailureTolerance)'
           metricsCollector.metricsEndpointsCSV: '$(metricsCollector.metricsEndpointsCSV)'
           metricsCollector.scrapeFrequencyInSecs: '$(metricsCollector.scrapeFrequencyInSecs)'
@@ -401,7 +392,6 @@ jobs:
           snitch.alert.url: '$(SnitchLongHaulAlertUrl)'
           snitch.storage.account: '$(snitch.storage.account)'
           snitch.storage.masterKey: '$(StorageAccountMasterKeyStress)'
-          loadGen.message.frequency: '$(loadGen.message.frequency.arm64v8)'
           longHaul.desiredModulesToRestartCSV: '$(longHaul.desiredModulesToRestartCSV)'
           longHaul.restartIntervalInMins: '$(longHaul.restartIntervalInMins)'
           longHaul.sendReportFrequency: '$(longHaul.sendReportFrequency)'
@@ -411,7 +401,6 @@ jobs:
           logAnalytics.sharedKey: '$(kvLogAnalyticSharedKey)'
           logAnalytics.logType: '$(logAnalyticsLogType)'
           twinTester.twinUpdateSize: '$(twinTester.twinUpdateSize)'
-          twinTester.twinUpdateFrequency: '$(twinTester.twinUpdateFrequency)'
           twinTester.twinUpdateFailureThreshold: '$(twinTester.twinUpdateFailureThreshold)'
           twinTester.edgeHubRestartFailureTolerance: '$(twinTester.edgeHubRestartFailureTolerance)'
           metricsCollector.metricsEndpointsCSV: '$(metricsCollector.metricsEndpointsCSV)'

diff --git a/builds/e2e/nested-connectivity.yaml b/builds/e2e/nested-connectivity.yaml
@@ -123,7 +123,6 @@ stages:
           eventHub.connectionString: '$(IotHub-EventHubConnStr)'
           deploymentFileName: 'nestededge_bottomLayerBaseDeployment_connectivity_mqtt.template.json'
           upstream.protocol: '$(upstream.protocol)'
-          loadGen.message.frequency: '$(loadGen.message.frequency.amd64)'
           edgeHubRestartTest.restartPeriod: '$(edgeHubRestartTest.restartPeriod)'
           edgeHubRestartTest.sdkOperationTimeout: '$(edgeHubRestartTest.sdkOperationTimeout)'
           testDuration: '$(testrun.duration)'

diff --git a/builds/e2e/templates/connectivity-deploy.yaml b/builds/e2e/templates/connectivity-deploy.yaml
@@ -14,7 +14,6 @@ parameters:
   iotHub.connectionString: ''
   eventHub.connectionString: ''
   upstream.protocol: ''
-  loadGen.message.frequency: ''
   networkController.description: ''
   networkController.frequencies: ''
   networkController.runProfile: ''
@@ -122,7 +121,6 @@ steps:
           -upstreamProtocol "${{ parameters['upstream.protocol'] }}" \
           -testDuration "${{ parameters['testDuration'] }}" \
           -testStartDelay "${{ parameters['testStartDelay'] }}" \
-          -loadGenMessageFrequency "${{ parameters['loadGen.message.frequency'] }}" \
           -networkControllerFrequency "${{ parameters['networkController.frequencies'] }}" \
           -networkControllerRunProfile "${{ parameters['networkController.runProfile'] }}" \
           -logAnalyticsWorkspaceId "${{ parameters['logAnalyticsWorkspaceId'] }}" \

diff --git a/builds/e2e/templates/longhaul-deploy.yaml b/builds/e2e/templates/longhaul-deploy.yaml
@@ -18,7 +18,6 @@ parameters:
   snitch.alert.url: ''
   snitch.storage.account: ''
   snitch.storage.masterKey: ''
-  loadGen.message.frequency: ''
   longHaul.desiredModulesToRestartCSV: ''
   longHaul.restartIntervalInMins: ''
   longHaul.sendReportFrequency: ''
@@ -27,7 +26,6 @@ parameters:
   logAnalytics.sharedKey: ''
   logAnalytics.logType: ''
   twinTester.twinUpdateSize: ''
-  twinTester.twinUpdateFrequency: ''
   twinTester.twinUpdateFailureThreshold: ''
   twinTester.edgeHubRestartFailureTolerance: ''
   metricsCollector.metricsEndpointsCSV: ''
@@ -104,7 +102,6 @@ steps:
             -eventHubConnectionString "${{ parameters['eventHub.connectionString'] }}" \
             -testStartDelay "${{ parameters['test.startDelay'] }}" \
             -restartIntervalInMins "${{ parameters['longHaul.restartIntervalInMins'] }}" \
-            -loadGenMessageFrequency "${{ parameters['loadGen.message.frequency'] }}" \
             -logAnalyticsWorkspaceId "${{ parameters['logAnalytics.workspaceId'] }}" \
             -logAnalyticsSharedKey "${{ parameters['logAnalytics.sharedKey'] }}" \
             -logAnalyticsLogType "${{ parameters['logAnalytics.logType'] }}" \
@@ -116,7 +113,6 @@ steps:
             -testRuntimeLogLevel "${{ parameters['test.runtimeLogLevel'] }}" \
             -testInfo "$testInfo" \
             -twinUpdateSize "${{ parameters['twinTester.twinUpdateSize'] }}" \
-            -twinUpdateFrequency "${{ parameters['twinTester.twinUpdateFrequency'] }}" \
             -edgeHubRestartFailureTolerance "${{ parameters['twinTester.edgeHubRestartFailureTolerance'] }}" \
             -desiredModulesToRestartCSV "${{ parameters['longHaul.desiredModulesToRestartCSV'] }}" \
             -sendReportFrequency "${{ parameters['longHaul.sendReportFrequency'] }}" \

diff --git a/builds/e2e/templates/nested-longhaul-deploy-amd64.yaml b/builds/e2e/templates/nested-longhaul-deploy-amd64.yaml
@@ -45,7 +45,6 @@ jobs:
           container.registry.password: '$(edgebuilds-azurecr-io-pwd)'
           iotHub.connectionString: '$(IotHub-ConnStr)'
           eventHub.connectionString: '$(IotHub-EventHubConnStr)'
-          loadGen.message.frequency: '$(loadGen.message.frequency)'
           longHaul.desiredModulesToRestartCSV: '$(longHaul.desiredModulesToRestartCSV)'
           longHaul.restartIntervalInMins: '$(longHaul.restartIntervalInMins)'
           longHaul.sendReportFrequency: '$(longHaul.sendReportFrequency)'
@@ -54,7 +53,6 @@ jobs:
           logAnalytics.sharedKey: '$(kvLogAnalyticSharedKey)'
           logAnalytics.logType: '$(logAnalyticsLogType)'
           twinTester.twinUpdateSize: '$(twinTester.twinUpdateSize)'
-          twinTester.twinUpdateFrequency: '$(twinTester.twinUpdateFrequency)'
           twinTester.twinUpdateFailureThreshold: '$(twinTester.twinUpdateFailureThreshold)'
           twinTester.edgeHubRestartFailureTolerance: '$(twinTester.edgeHubRestartFailureTolerance)'
           metricsCollector.metricsEndpointsCSV: '$(metricsCollector.metricsEndpointsCSV)'

diff --git a/builds/e2e/templates/nested-longhaul-deploy-arm32.yaml b/builds/e2e/templates/nested-longhaul-deploy-arm32.yaml
@@ -46,7 +46,6 @@ jobs:
           container.registry.password: '$(edgebuilds-azurecr-io-pwd)'
           iotHub.connectionString: '$(IotHub-ConnStr)'
           eventHub.connectionString: '$(IotHub-EventHubConnStr)'
-          loadGen.message.frequency: '$(loadGen.message.frequency)'
           longHaul.desiredModulesToRestartCSV: '$(longHaul.desiredModulesToRestartCSV)'
           longHaul.restartIntervalInMins: '$(longHaul.restartIntervalInMins)'
           longHaul.sendReportFrequency: '$(longHaul.sendReportFrequency)'
@@ -55,7 +54,6 @@ jobs:
           logAnalytics.sharedKey: '$(kvLogAnalyticSharedKey)'
           logAnalytics.logType: '$(logAnalyticsLogType)'
           twinTester.twinUpdateSize: '$(twinTester.twinUpdateSize)'
-          twinTester.twinUpdateFrequency: '$(twinTester.twinUpdateFrequency)'
           twinTester.twinUpdateFailureThreshold: '$(twinTester.twinUpdateFailureThreshold)'
           twinTester.edgeHubRestartFailureTolerance: '$(twinTester.edgeHubRestartFailureTolerance)'
           metricsCollector.metricsEndpointsCSV: '$(metricsCollector.metricsEndpointsCSV)'

diff --git a/builds/e2e/templates/nested-longhaul-deploy-arm64.yaml b/builds/e2e/templates/nested-longhaul-deploy-arm64.yaml
@@ -46,7 +46,6 @@ jobs:
           container.registry.password: '$(edgebuilds-azurecr-io-pwd)'
           iotHub.connectionString: '$(IotHub-ConnStr)'
           eventHub.connectionString: '$(IotHub-EventHubConnStr)'
-          loadGen.message.frequency: '$(loadGen.message.frequency)'
           longHaul.desiredModulesToRestartCSV: '$(longHaul.desiredModulesToRestartCSV)'
           longHaul.restartIntervalInMins: '$(longHaul.restartIntervalInMins)'
           longHaul.sendReportFrequency: '$(longHaul.sendReportFrequency)'
@@ -55,7 +54,6 @@ jobs:
           logAnalytics.workspaceId: '$(kvLogAnalyticWorkspaceId)'
           logAnalytics.sharedKey: '$(kvLogAnalyticSharedKey)'
           twinTester.twinUpdateSize: '$(twinTester.twinUpdateSize)'
-          twinTester.twinUpdateFrequency: '$(twinTester.twinUpdateFrequency)'
           twinTester.twinUpdateFailureThreshold: '$(twinTester.twinUpdateFailureThreshold)'
           twinTester.edgeHubRestartFailureTolerance: '$(twinTester.edgeHubRestartFailureTolerance)'
           metricsCollector.metricsEndpointsCSV: '$(metricsCollector.metricsEndpointsCSV)'

diff --git a/builds/e2e/templates/nested-longhaul-deploy.yaml b/builds/e2e/templates/nested-longhaul-deploy.yaml
@@ -15,7 +15,6 @@ parameters:
   container.registry.password: ''
   iotHub.connectionString: ''
   eventHub.connectionString: ''
-  loadGen.message.frequency: ''
   longHaul.desiredModulesToRestartCSV: ''
   longHaul.restartIntervalInMins: ''
   longHaul.sendReportFrequency: ''
@@ -24,7 +23,6 @@ parameters:
   logAnalytics.sharedKey: ''
   logAnalytics.logType: ''
   twinTester.twinUpdateSize: ''
-  twinTester.twinUpdateFrequency: ''
   twinTester.twinUpdateFailureThreshold: ''
   twinTester.edgeHubRestartFailureTolerance: ''
   metricsCollector.metricsEndpointsCSV: ''
@@ -172,7 +170,6 @@ steps:
             -eventHubConnectionString "${{ parameters['eventHub.connectionString'] }}" \
             -testStartDelay "${{ parameters['test.startDelay'] }}" \
             -restartIntervalInMins "${{ parameters['longHaul.restartIntervalInMins'] }}" \
-            -loadGenMessageFrequency "${{ parameters['loadGen.message.frequency'] }}" \
             -logAnalyticsWorkspaceId "${{ parameters['logAnalytics.workspaceId'] }}" \
             -logAnalyticsSharedKey "${{ parameters['logAnalytics.sharedKey'] }}" \
             -logAnalyticsLogType "${{ parameters['logAnalytics.logType'] }}" \

diff --git a/e2e_deployment_files/connectivity_deployment.template.json b/e2e_deployment_files/connectivity_deployment.template.json
@@ -156,6 +156,9 @@
               },
               "trackingId": {
                 "value": "<TrackingId>"
+              },
+              "DirectMethodFrequency": {
+                "value": "<DirectMethodFrequency>"
               }
             },
             "settings": {
@@ -213,6 +216,9 @@
               },
               "trackingId": {
                 "value": "<TrackingId>"
+              },
+              "DirectMethodFrequency": {
+                "value": "<DirectMethodFrequency>"
               }
             },
             "settings": {
@@ -273,6 +279,9 @@
               },
               "trackingId": {
                 "value": "<TrackingId>"
+              },
+              "DirectMethodFrequency": {
+                "value": "<DirectMethodFrequency>"
               }
             },
             "settings": {

diff --git a/e2e_deployment_files/long_haul_deployment.template.json b/e2e_deployment_files/long_haul_deployment.template.json
@@ -258,6 +258,9 @@
               },
               "trackingId": {
                 "value": "<TrackingId>"
+              },
+              "DirectMethodFrequency": {
+                "value": "<DirectMethodFrequency>"
               }
             },
             "settings": {
@@ -312,6 +315,9 @@
               },
               "trackingId": {
                 "value": "<TrackingId>"
+              },
+              "DirectMethodFrequency": {
+                "value": "<DirectMethodFrequency>"
               }
             },
             "settings": {