From 717041231c1252eff13d456d5af76722ef85a891 Mon Sep 17 00:00:00 2001
From: ericuss <etorreg@gmail.com>
Date: Fri, 3 Apr 2020 10:28:16 +0200
Subject: [PATCH] disable windows containers in buildimages and multiarch yaml

---
 build/azure-devops/buildimages.yaml |  9 +++++----
 build/azure-devops/multiarch.yaml   | 17 +++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml
index 2e58cad21..8facf4399 100644
--- a/build/azure-devops/buildimages.yaml
+++ b/build/azure-devops/buildimages.yaml
@@ -13,7 +13,7 @@ jobs:
   - bash: docker-compose -f src/docker-compose.yml build ${{ parameters.services }}
     displayName: Compose build ${{ parameters.services }}
     env:
-      TAG: ${{ variables['Build.SourceBranchName'] }}
+      TAG: pr-test-${{ variables['Build.SourceBranchName'] }}
 - job: BuildContainersForPR_Windows
   condition: False
   # condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
@@ -27,7 +27,8 @@ jobs:
       PLATFORM: win
       NODE_IMAGE: stefanscherer/node-windows:10
 - job: BuildLinux
-  condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
+  condition: true
+  # condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
@@ -41,7 +42,7 @@ jobs:
       qualifyImageNames: true
       projectName: ""
       dockerComposeFileArgs: |
-        TAG=${{ variables['Build.SourceBranchName'] }}
+        TAG=pr-test-${{ variables['Build.SourceBranchName'] }}
   - task: DockerCompose@0
     displayName: Compose push ${{ parameters.images }}
     inputs:
@@ -52,7 +53,7 @@ jobs:
       qualifyImageNames: true
       projectName: ""
       dockerComposeFileArgs: |
-        TAG=${{ variables['Build.SourceBranchName'] }}
+        TAG=pr-test-${{ variables['Build.SourceBranchName'] }}
   - task: CopyFiles@2
     inputs:
       sourceFolder: ${{ parameters.helmfrom }}
diff --git a/build/azure-devops/multiarch.yaml b/build/azure-devops/multiarch.yaml
index 78a2b92be..d851017db 100644
--- a/build/azure-devops/multiarch.yaml
+++ b/build/azure-devops/multiarch.yaml
@@ -6,9 +6,10 @@ parameters:
 
 jobs:
 - job: manifest
-  condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
+  condition: true
+  # condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
   dependsOn:
-    - BuildWindows
+    # - BuildWindows
     - BuildLinux  
   pool: 
     vmImage: 'Ubuntu 16.04'
@@ -19,12 +20,16 @@ jobs:
       command: login
       containerregistrytype: 'Container Registry'
       dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
+      
+      # Disabled windows deploy
+      # docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:win-${{ parameters.branch }}
+      # docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
   - bash: |
       mkdir -p ~/.docker
       sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
       echo ',"experimental": "enabled" }' >> ~/.docker/config.json
-      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:win-${{ parameters.branch }}
-      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
-      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}
-      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:latest
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:pr-test-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:pr-test-linux-${{ parameters.branch }}
+      docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:pr-test-latest ${{ parameters.registry }}/${{ parameters.image }}:pr-test-linux-latest
+      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:pr-test-${{ parameters.branch }}
+      docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:pr-test-latest
     displayName: Create multiarch manifest