Merge pull request #2492 from Azure/prepare-2.13.0

Release 2.13.0

.gitignore

@@ -3,6 +3,7 @@ build/
 dll/
 typings/
 logs/
+env/
 *.log*
 *.mem.csv
 release/

.vscode/extensions.json

@@ -2,7 +2,6 @@
   "recommendations": [
     "stylelint.vscode-stylelint",
     "EditorConfig.EditorConfig",
-    "msjsdiag.debugger-for-chrome",
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
     "rvest.vs-code-prettier-eslint",

.vsts/common/generate-sbom.yml

@@ -0,0 +1,6 @@
+steps:
+  - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
+    displayName: "SBOM Generation"
+    inputs:
+      BuildDropPath: ./release
+

.vsts/darwin/darwin-dependencies.yml

@@ -1,11 +1,7 @@
 steps:
   - template: ../dependencies.yml
-  - template: ../pyenv.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      python --version
-      pip install -r python/requirements.txt
       echo "Node.js version $(node --version)"
       echo "NPM version $(npm --version)"
       npm ci

.vsts/darwin/distribution.yml

@@ -28,6 +28,7 @@ steps:
     displayName: Build dmg
   - script: npm run package darwin-manifest
     displayName: Create manifest
+  - template: ../common/generate-sbom.yml
   - template: ../common/publish-artifacts.yml
     parameters:
       folder: darwin

.vsts/darwin/sign.yml

@@ -1,4 +1,10 @@
 steps:
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 2.1.x
+
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     inputs:
       ConnectedServiceName: 'ESRP CodeSign'

.vsts/dependencies.yml

@@ -2,6 +2,5 @@ steps:
   - powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
     displayName: Resolve build type
 
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '16.x.x'
+  - template: ./node-setup.yml
+  - template: ./python-setup.yml

.vsts/distribution.yml

@@ -2,19 +2,26 @@
 jobs:
   - job: Linux
     pool:
-      vmImage: ubuntu-18.04
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+      - ImageOverride -equals BatchExplorerBuildImage-Linux
     steps:
        - template: ./linux/distribution.yml
 
   - job: MacOS
     pool:
       vmImage: macOS-10.15
       demands: xcode
+    variables:
+      - name: EOCompliance-Mac
+        value: true
     steps:
        - template: ./darwin/distribution.yml
 
   - job: Windows
     pool:
-      vmImage: vs2017-win2016
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+      - ImageOverride -equals BatchExplorerBuildImage-Windows
     steps:
       - template: ./win/distribution.yml

.vsts/linux/distribution.yml

@@ -10,6 +10,7 @@ steps:
       . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
       npm run package linux-manifest
     displayName: Create manifest
+  - template: ../common/generate-sbom.yml
   - template: ../common/publish-artifacts.yml
     parameters:
       folder: linux

.vsts/linux/linux-dependencies.yml

@@ -8,12 +8,8 @@ steps:
       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0 rpm
     displayName: Install Linux packages
   - template: ../dependencies.yml
-  - template: ../pyenv.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      echo "Python version $(python --version)"
-      pip install -r python/requirements.txt
       echo "Node.js version $(node --version)"
       echo "NPM version $(npm --version)"
       npm install -g codecov

.vsts/node-setup.yml

@@ -0,0 +1,13 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '16.x.x'
+
+  - script: |
+      cp .vsts/pipelines.npmrc .npmrc
+    displayName: Stage .npmrc configuration
+
+  - task: npmAuthenticate@0
+    displayName: Authenticate with NPM private feed
+    inputs:
+      workingFile: .npmrc

.vsts/pipelines.npmrc

@@ -0,0 +1,3 @@
+registry=https://azurebatch.pkgs.visualstudio.com/_packaging/BatchExplorer/npm/registry/
+
+always-auth=true

.vsts/pipelines.yml

@@ -2,32 +2,43 @@ name: $(SourceBranch)$(Rev:.r)
 jobs:
   - job: Linux
     pool:
-      vmImage: ubuntu-18.04
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+        - ImageOverride -equals BatchExplorerBuildImage-Linux
     steps:
-       - template: ./linux/ci.yml
+      - template: ./linux/ci.yml
 
   - job: MacOS
     pool:
       vmImage: macOS-10.15
       demands: xcode
+    variables:
+      - name: EOCompliance-Mac
+        value: true
     steps:
-       - template: ./darwin/ci.yml
+      - template: ./darwin/ci.yml
 
   - job: Windows
     pool:
-      vmImage: windows-2019
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+        - ImageOverride -equals BatchExplorerBuildImage-Windows
+    variables:
+      Packaging.EnableSBOMSigning: true
     steps:
       - template: ./win/ci.yml
 
   - job: RegisterDependencies
     displayName: Register dependencies
     pool:
-      vmImage: vs2017-win2016
+      name: Azure-Pipelines-EO-Batch-Explorer
+      demands:
+        - ImageOverride -equals BatchExplorerBuildImage-Windows
     condition: ne(variables['Build.Reason'], 'PullRequest')
     variables:
       EnableDetectorPip: true
     continueOnError: true
     steps:
       - template: ./win/win-dependencies.yml
       - task: ComponentGovernanceComponentDetection@0
-        displayName: 'Component Detection'
+        displayName: "Component Detection"

.vsts/python-setup.yml

@@ -0,0 +1,29 @@
+steps:
+  - task: UsePythonVersion@0
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
+    inputs:
+      versionSpec: '3.8.x'
+    displayName: Install Python 3.8 for Batch Explorer
+
+  - bash: ./scripts/azpipelines/setup-python.sh
+    displayName: Set up Python environment and private feed
+
+  - task: PipAuthenticate@1
+    displayName: 'Pip Authenticate'
+    inputs:
+      artifactFeeds: 'BatchExplorer'
+
+  - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      pip install -r python/requirements.txt
+    condition: ne( variables['Agent.OS'], 'Windows_NT' )
+    displayName: Install Python dependencies (Linux)
+
+  - powershell: |
+      . .vsts/win/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
+      exec { pip install -r python/requirements.txt }
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
+    displayName: Install Python dependencies (Windows)

.vsts/update-en-loc.yml

@@ -2,11 +2,11 @@ variables:
   locdir: $(Build.ArtifactStagingDirectory)/BatchExplorer
 
 pool:
-  vmImage: ubuntu-20.04
+  name: Azure-Pipelines-EO-Batch-Explorer
+  demands:
+  - ImageOverride -equals BatchExplorerBuildImage-Linux
 steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '16.x.x'
+  - template: ./node-setup.yml
 
   - script: npm ci
     displayName: Install dependencies

.vsts/win/ci.yml

@@ -1,38 +1,21 @@
 steps:
-  # Static analysis before build
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-    displayName: 'Run CredScan'
-    inputs:
-      suppressionsFile: test/cred-scan-exclude.json
-      toolMajorVersion: V2
-      debugMode: false
-
+  - template: ./credscan.yml
   - template: ./win-dependencies.yml
 
-  - powershell: npm run build-and-pack
+  - powershell: |
+      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
+      npm run build-and-pack
     displayName: Build and package
 
   - powershell: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
-      $env:SPECTRON_AAD_USER_EMAIL = "$(uiTestingAccountEmail)"
-      $env:SPECTRON_AAD_USER_PASSWORD = "$(uiTestingAccountPassword)"
-      npm run spectron
-    displayName: Running spectron
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'AntiMalware Scanner'
-    inputs:
-      EnableServices: true
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
-    displayName: 'Publish Security Analysis Logs'
-
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
-    displayName: 'Post Analysis'
-    inputs:
-      CredScan: true
+      $env:BE_TEST_AAD_USER_EMAIL = "$(uiTestingAccountEmail)"
+      $env:BE_TEST_AAD_USER_PASSWORD = "$(uiTestingAccountPassword)"
+      npm run test-e2e
+    displayName: End to end tests
 
+  - template: ./security-analysis.yml
 
   - template: ../common/publish-artifacts.yml
     parameters:

.vsts/win/credscan.yml

@@ -0,0 +1,9 @@
+steps:
+  # Static analysis before build
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+    displayName: "Run CredScan"
+    inputs:
+      suppressionsFile: test/cred-scan-exclude.json
+      toolMajorVersion: V2
+      debugMode: false
+

.vsts/win/distribution.yml

@@ -1,15 +1,19 @@
 steps:
+  - template: ./credscan.yml
   - template: ./win-dependencies.yml
   - powershell: ./scripts/azpipelines/update-build-name.ps1
     displayName: Resolve version
   - powershell: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
+      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
       exec { npm run build:prod }
       exec { npm run build-python }
       exec { npm run package win-exe }
     displayName: Build executable
 
+  - template: ./security-analysis.yml
+
   - template: ./sign.yml
     parameters:
       name: "Sign executable and dll"
@@ -27,6 +31,7 @@ steps:
         **/BatchExplorer*Setup*.exe
   - powershell: npm run package win-manifest
     displayName: Create manifest
+  - template: ../common/generate-sbom.yml
   - template: ../common/publish-artifacts.yml
     parameters:
       folder: windows

.vsts/win/security-analysis.yml

@@ -0,0 +1,13 @@
+steps:
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
+    displayName: "AntiMalware Scanner"
+    inputs:
+      EnableServices: true
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+    displayName: "Publish Security Analysis Logs"
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
+    displayName: "Post Analysis"
+    inputs:
+      CredScan: true

.vsts/win/win-dependencies.yml

@@ -1,19 +1,11 @@
 steps:
   - template: ../dependencies.yml
 
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.8.x'
-    displayName: Install python 3.8 for BatchExplorer
-
   # KLUDGE: Use `npm i` instead of `npm ci` due to this issue:
   #         https://github.com/npm/cli/issues/558#issuecomment-580392554
   - powershell: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { python -m pip install --upgrade pip }
-      exec { python --version }
-      exec { pip install -r python/requirements.txt }
       exec { Write-Host "Node.js version" $(node --version) }
       exec { Write-Host "NPM version" $(npm --version) }
       exec { npm install --loglevel=error }

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 2.13.0
+
+[All items](https://github.com/Azure/BatchExplorer/milestone/47?closed=1)
+
+### Features
+
+* Restore SKU API support for displaying VM information in Pools [\#2462](https://github.com/Azure/BatchExplorer/issues/2462)
+
+### Bugs
+
+* Accessibility fixes and improvements  [\#2471](https://github.com/Azure/BatchExplorer/issues/2471)
+* Heatmaps did not display task slot information correctly [\#2461](https://github.com/Azure/BatchExplorer/issues/2461)
+
+### Other
+
+* Cyber Executive Order Compliance [\#2457](https://github.com/Azure/BatchExplorer/issues/2457)
+
 # 2.12.1
 
 ### Hot Fixes