Fix template conditional

Azure · Jan 24, 2022 · b30ec7d · b30ec7d
1 parent 8658ee7
commit b30ec7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -88,8 +88,8 @@ jobs:
           arguments: '--project-list $(ProjectList)'
         condition: and(succeeded(), eq(variables['ShouldRunSourceTests'],'true'))
 
-      - template: /eng/pipelines/templates/steps/install-java-17.yml
-        condition: and(succeeded(), contains(variables['Agent.OS'], 'linux'))
+      - ${{ if contains(variables['Agent.OS'], 'linux') }}:
+        - template: /eng/pipelines/templates/steps/install-java-17.yml
 
       - task: Maven@3
         displayName: 'Build for non-From Source run'

diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
@@ -155,8 +155,8 @@ jobs:
           pip install markdown2 BeautifulSoup4
         displayName: 'pip install markdown2 and BeautifulSoup4'
 
-      - template: /eng/pipelines/templates/steps/install-java-17.yml
-        condition: and(succeeded(), contains(variables['Agent.OS'], 'linux'))
+      - ${{ if contains(variables['Agent.OS'], 'linux') }}:
+        - template: /eng/pipelines/templates/steps/install-java-17.yml
 
       - task: Maven@3
         displayName: 'Build and Package, JDK Version: $(JavaBuildVersion)'
@@ -308,8 +308,8 @@ jobs:
       # reports. This means it is available as part of that, but also so that this is not documented in the project report.
       - template: ../steps/install-reporting-tools.yml
 
-      - template: /eng/pipelines/templates/steps/install-java-17.yml
-        condition: and(succeeded(), contains(variables['Agent.OS'], 'linux'))
+      - ${{ if contains(variables['Agent.OS'], 'linux') }}:
+        - template: /eng/pipelines/templates/steps/install-java-17.yml
 
       # maven dependency:tree needs to be able to resolve dependencies, so these should be installed.
       - task: Maven@3