test: focused conditional

Author: jpayne3506

.pipelines/build/images.jobs.yaml

@@ -7,8 +7,10 @@ jobs:
 - ${{ each job_data in parameters.images }}:
   - job: pkg_${{ job_data.job }}
     displayName: "Prepare Image Package - ${{ job_data.displayName }} -"
-    ${{ if job_data.condition }}:
-      condition: ${{ job_data.condition }}
+    ${{ if job_data.strategy.matrix.azure_ip_masq_merger }}:
+      condition: ${{ job_data.strategy.matrix.azure_ip_masq_merger.shouldRun }}
+    ${{ if job_data.strategy.matrix.npm }}:
+      condition: ${{ job_data.strategy.matrix.npm.shouldRun }}
     ${{ if job_data.strategy }}:
       strategy: ${{ job_data.strategy }}
     ${{ if job_data.dependsOn }}:

.pipelines/run-pipeline.yaml

@@ -26,14 +26,14 @@ stages:
               archiveName: azure-ip-masq-merger
               archiveVersion: $(AZURE_IP_MASQ_MERGER_VERSION)
               imageTag: $(Build.BuildNumber)
-              condition: contains( variables['acn-ref'] , 'v1.7')
+              shouldRun: contains( variables['acn-ref'] , 'v1.7')
             npm:
               name: npm
               extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
               archiveName: azure-npm
               archiveVersion: $(NPM_VERSION)
               imageTag: $(Build.BuildNumber)
-              condition: contains( variables['acn-ref'] , 'v1.6')
+              shouldRun: contains( variables['acn-ref'] , 'v1.6')
 
   - job: copy
     displayName: Copy Pipeline Files