ci: Renable ffmpeg and mksnapshot tests on Azure Devops (#15800)

* ci: Renable ffmpeg and mksnapshot tests on VSTS

Also, add testing of ffmpeg and mksnapshot to arm tests

.circleci/config.yml

@@ -493,6 +493,17 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
     - *step-mksnapshot-build
     - *step-mksnapshot-store
 
+    # native_mksnapshot
+    - *step-maybe-native-mksnapshot-gn-gen
+    - *step-maybe-native-mksnapshot-build
+    - *step-maybe-native-mksnapshot-strip
+    - *step-maybe-native-mksnapshot-store
+
+    # ffmpeg
+    - *step-ffmpeg-gn-gen
+    - *step-ffmpeg-build
+    - *step-ffmpeg-store
+
     # Save all data needed for a further tests run.
     - *step-persist-data-for-tests
 

vsts-arm-test-steps.yml

@@ -11,6 +11,7 @@ steps:
 
 - bash: |
     export ZIP_DEST=$PWD/src/out/Default
+    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
     mkdir -p $ZIP_DEST
     cd src/electron
     node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
@@ -20,6 +21,26 @@ steps:
   env:
     CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
 
+- bash: |
+    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
+    mkdir -p $FFMPEG_ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
+    cd $FFMPEG_ZIP_DEST
+    unzip -o ffmpeg.zip
+  displayName: 'Download and unzip ffmpeg for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=native_mksnapshot.zip --dest=$ZIP_DEST
+    cd $ZIP_DEST
+    unzip -o native_mksnapshot.zip
+  displayName: 'Download and unzip native_mksnapshot.zip for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
 - bash: |
    export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
    mkdir -p $NODE_HEADERS_DEST
@@ -44,6 +65,18 @@ steps:
   env:
     DISPLAY: ":99.0"
 
+- bash: |
+    cd src
+    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+  displayName: Verify non proprietary ffmpeg
+  timeoutInMinutes: 5
+
+- bash: |
+    cd src
+    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
+  displayName: Verify mksnapshot
+  timeoutInMinutes: 5
+
 - bash: |
    cd src
    ./out/Default/electron electron/spec --ci

vsts.yml

@@ -122,20 +122,6 @@ jobs:
     condition: and(succeeded(), ne(variables['ELECTRON_RELEASE'], '1'))
     timeoutInMinutes: 1
 
-  - bash: |
-      cd src
-      python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
-    displayName: Verify non proprietary ffmpeg
-    condition: and(eq('DISABLED', 'breaking consistently'), and(succeeded(), eq(variables['RUN_TESTS'], '1')))
-    timeoutInMinutes: 5
-
-  - bash: |
-      cd src
-      python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
-    displayName: Verify mksnapshot
-    condition: and(eq('DISABLED', 'breaking sometimes?'), and(succeeded(), eq(variables['RUN_TESTS'], '1')))
-    timeoutInMinutes: 5
-
   - bash: |
       cd src
       ninja -C out/Default electron:electron_dist_zip
@@ -209,6 +195,13 @@ jobs:
       ArtifactName: Default
     timeoutInMinutes: 1
 
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Build Artifacts (ffmpeg.zip)
+    inputs:
+      PathtoPublish: '$(System.DefaultWorkingDirectory)/src/out/ffmpeg/ffmpeg.zip'
+      ArtifactName: Default
+    timeoutInMinutes: 1
+
   - bash: |
       echo $BUILD_SOURCEVERSION > revision
     displayName: Save exact revision
@@ -298,6 +291,28 @@ jobs:
       destinationFolder: src/out/Default
     timeoutInMinutes: 1
 
+  - task: ExtractFiles@1
+    displayName: Extract ffmpeg
+    inputs:
+      archiveFilePatterns: $(System.ArtifactsDirectory)/Default/ffmpeg.zip
+      destinationFolder: src/out/ffmpeg
+    timeoutInMinutes: 1
+
+  - task: ExtractFiles@1
+    displayName: Extract mksnapshot
+    inputs:
+      archiveFilePatterns: $(System.ArtifactsDirectory)/Default/mksnapshot.zip
+      destinationFolder: src/out/mksnapshot
+    timeoutInMinutes: 1
+
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: src/out/Default'
+    inputs:
+      SourceFolder: src/out/mksnapshot
+      TargetFolder: src/out/Default
+      OverWrite: true
+    timeoutInMinutes: 1
+
   - task: ExtractFiles@1
     displayName: Extract Node.js headers
     inputs:
@@ -317,6 +332,18 @@ jobs:
     displayName: Install Node.js modules
     timeoutInMinutes: 4  # Should take about 30 seconds.
 
+  - bash: |
+      cd src
+      python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+    displayName: Verify non proprietary ffmpeg
+    timeoutInMinutes: 5
+
+  - bash: |
+      cd src
+      python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
+    displayName: Verify mksnapshot
+    timeoutInMinutes: 5
+
   - bash: |
       if pgrep Electron; then
         killall Electron