cleanup multiarch

build/azure-pipelines/linux/product-build-linux-alpine.yml

-steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.10.1"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- task: Docker@1
-  displayName: 'Pull image'
-  inputs:
-    azureSubscriptionEndpoint: 'vscode-builds-subscription'
-    azureContainerRegistry: vscodehub.azurecr.io
-    command: 'Run an image'
-    imageName: 'vscode-linux-build-agent:alpine'
-    containerCommand: uname
-
-- script: |
-    set -e
-
-    cat << EOF > ~/.netrc
-    machine monacotools.visualstudio.com
-    password $(devops-pat)
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  displayName: Prepare tooling
-
-- script: |
-    set -e
-    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
-    git fetch distro
-    git merge $(node -p "require('./package.json').distro")
-  displayName: Merge distro
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-
-- script: |
-    set -e
-    yarn --frozen-lockfile
-    node build/azure-pipelines/common/installDistroDependencies.js
-    node build/azure-pipelines/common/installDistroDependencies.js remote
-  displayName: Install dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, quality/*/package.json, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-
-- script: |
-    set -e
-    yarn postinstall
-  displayName: Run postinstall scripts
-  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
-
-- script: |
-    set -e
-    yarn gulp mixin
-  displayName: Mix in quality
-
-- script: |
-    set -e
-    ./build/azure-pipelines/linux/prebuild-alpine.sh
-  displayName: Prepare build
-
-- script: |
-    set -e
-    ./build/azure-pipelines/linux/build-alpine.sh
-  displayName: Build
-
-- script: |
-    set -e
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
-    ./build/azure-pipelines/linux/publish-alpine.sh
-  displayName: Publish
-
-- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-  displayName: 'Component Detection'
-  continueOnError: true
\ No newline at end of file

build/azure-pipelines/linux/product-build-linux-arm.yml → build/azure-pipelines/linux/product-build-linux-multiarch.yml

@@ -38,7 +38,7 @@ steps:
     azureSubscriptionEndpoint: 'vscode-builds-subscription'
     azureContainerRegistry: vscodehub.azurecr.io
     command: 'Run an image'
-    imageName: 'vscode-linux-build-agent:armhf'
+    imageName: 'vscode-linux-build-agent:$(VSCODE_ARCH)'
     containerCommand: uname
 
 - script: |
@@ -97,12 +97,12 @@ steps:
 
 - script: |
     set -e
-    ./build/azure-pipelines/linux/prebuild-arm.sh
+    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/prebuild.sh
   displayName: Prebuild
 
 - script: |
     set -e
-    ./build/azure-pipelines/linux/build-arm.sh
+    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/build.sh
   displayName: Build
 
 - script: |
@@ -111,7 +111,7 @@ steps:
     AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
     VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
-    ./build/azure-pipelines/linux/publish-arm.sh
+    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/publish.sh
   displayName: Publish
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

build/azure-pipelines/product-build.yml

@@ -75,7 +75,7 @@ jobs:
   dependsOn:
   - Compile
   steps:
-  - template: linux/product-build-linux-arm.yml
+  - template: linux/product-build-linux-multiarch.yml
 
 - job: LinuxAlpine
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
@@ -87,7 +87,7 @@ jobs:
   dependsOn:
   - Compile
   steps:
-  - template: linux/product-build-linux-alpine.yml
+  - template: linux/product-build-linux-multiarch.yml
 
 - job: macOS
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))