diff options
author | Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> | 2022-06-08 11:06:18 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-08 11:06:18 +0300 |
commit | dc1ee4b14c2aee0cd8b276707fee78e66629d0ac (patch) | |
tree | 1484408b5e7493055781f3c7f0ed014b4f89f70e | |
parent | 2c0a136079200e864c62989c2bd06e6fc2d7aee0 (diff) |
Engineering - Do not run macOSTest job if VSCODE_STEP_ON_IT is set (#150794)
Do not run macOSTest job if VSCODE_STEP_ON_IT is set
-rw-r--r-- | build/azure-pipelines/darwin/product-build-darwin-test.yml | 3 | ||||
-rw-r--r-- | build/azure-pipelines/product-build.yml | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/build/azure-pipelines/darwin/product-build-darwin-test.yml b/build/azure-pipelines/darwin/product-build-darwin-test.yml index dd495426b6d..98d61becadd 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-test.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-test.yml @@ -158,7 +158,6 @@ steps: VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install" displayName: Download Electron and Playwright - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: # Setting hardened entitlements is a requirement for: @@ -216,7 +215,7 @@ steps: compile-extension:vscode-notebook-tests \ compile-extension:vscode-test-resolver displayName: Build integration tests - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false')) + condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}: - script: | diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 3cc4fc399d9..fb8a6ff3aa4 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -335,14 +335,15 @@ stages: BUILDSECMON_OPT_IN: true jobs: - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: - - job: macOSTest - timeoutInMinutes: 90 - variables: - VSCODE_ARCH: x64 - steps: - - template: darwin/product-build-darwin-test.yml - parameters: - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} + - ${{ if eq(parameters.VSCODE_STEP_ON_IT, false) }}: + - job: macOSTest + timeoutInMinutes: 90 + variables: + VSCODE_ARCH: x64 + steps: + - template: darwin/product-build-darwin-test.yml + parameters: + VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}: - job: macOS |