From 3a9dc65c8918816ff0b432b86625e602e49a29e6 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Jan 2022 09:04:32 -0500 Subject: [PATCH 1/4] Take ARMv6 out of PlatformGroup All, CoreCLR assumes this means full support --- eng/pipelines/common/platform-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 0938ee359b4a47..13887c2c8e7871 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -53,7 +53,7 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # Linux armv6 -- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), in(parameters.platformGroup, 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} From 1ab5ce2ea1abc59836af2fbb6b4796e849cf19fb Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Jan 2022 09:29:34 -0500 Subject: [PATCH 2/4] Update eng/pipelines/common/platform-matrix.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexander Köplinger --- eng/pipelines/common/platform-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 13887c2c8e7871..752dd1790d3132 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -53,7 +53,7 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # Linux armv6 -- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), in(parameters.platformGroup, 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), or(and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'gcstress')), and(ne(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'all', 'gcstress'))) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} From 79a01df69f7ee4310ee22042e1807c203bcc66ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 25 Jan 2022 15:35:32 +0100 Subject: [PATCH 3/4] Fix .yml --- eng/pipelines/common/platform-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 752dd1790d3132..dc0c7a18a1b3c4 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -53,7 +53,7 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # Linux armv6 -- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), or(and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'gcstress')), and(ne(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'all', 'gcstress'))) }}: +- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), or(and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'gcstress')), and(ne(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'all', 'gcstress')))) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} From 5fccd67bb56afeea6e4573071ab0aea0540d1c71 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 25 Jan 2022 10:48:09 -0500 Subject: [PATCH 4/4] This yml was exactly the wrong way round, i.e. PlatforGroup all when NOT mono --- eng/pipelines/common/platform-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index dc0c7a18a1b3c4..4f0200380bc9f7 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -53,7 +53,7 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # Linux armv6 -- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), or(and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'gcstress')), and(ne(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'all', 'gcstress')))) }}: +- ${{ if or(containsValue(parameters.platforms, 'Linux_armv6'), or(and(ne(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'gcstress')), and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.platformGroup, 'all', 'gcstress')))) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }}