move conditional logType check to main template

Author: camrynl

.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

@@ -233,7 +233,8 @@ stages:
               iterations: ${ITERATIONS_CILIUM}
               nodeCount: ${{ parameters.nodeCount }}
               cni: cilium
-              upgradeScenario: ${{ parameters.upgradeScenario }}
+              ${{ if eq(parameters.upgradeScenario, 'true') }}:
+                logType: upgradeScaleTest
           - template: ../load-test-templates/validate-state-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
@@ -249,7 +250,8 @@ stages:
               os: ${{ parameters.os }}
               cni: cilium
               region: $(location)
-              upgradeScenario: ${{ parameters.upgradeScenario }}
+              ${{ if eq(parameters.upgradeScenario, 'true') }}:
+                logType: upgradeRestartNode
           - template: ../load-test-templates/validate-state-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)

.pipelines/cni/load-test-templates/pod-deployment-template.yaml

@@ -6,7 +6,7 @@ parameters:
   nodeCount: 10
   cni: ""
   jobName: "deploy_pods"
-  upgradeScenario: ""
+  logType: "scaleTest"
 
 steps:
   - task: AzureCLI@2
@@ -30,7 +30,4 @@ steps:
       os: ${{ parameters.os }}
       cni: ${{ parameters.cni }}
       jobName: ${{ parameters.jobName }}
-      ${{ if eq(parameters.upgradeScenario, 'true') }}:
-        logType: upgradeScaleTest
-      ${{ else }}:
-        logType: scaleTest
+      logType: ${{ parameters.logType }}

.pipelines/cni/load-test-templates/restart-node-template.yaml

@@ -4,7 +4,7 @@ parameters:
   cni: ""
   jobName: "restart_nodes"
   region: ""
-  upgradeScenario: ""
+  logType: "restartNode"
 
 steps:
   - task: AzureCLI@2
@@ -57,10 +57,7 @@ steps:
   - template: ../../templates/log-template.yaml
     parameters:
       clusterName: ${{ parameters.clusterName }}
-      ${{ if eq(parameters.upgradeScenario, 'true') }}:
-        logType: upgradeRestartNode
-      ${{ else }}:
-        logType: restartNode
+      logType: ${{ parameters.logType }}
       os: ${{ parameters.os }}
       cni: ${{ parameters.cni }}
       jobName: ${{ parameters.jobName }}