From dafcda3e11c38df348289c5a6604c2d2f850cb08 Mon Sep 17 00:00:00 2001 From: Praveen Kuttappan Date: Mon, 28 Jun 2021 15:46:47 -0400 Subject: [PATCH 1/2] Simplify Ubuntu image name check for dns bypass --- eng/common/pipelines/templates/steps/bypass-local-dns.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/eng/common/pipelines/templates/steps/bypass-local-dns.yml b/eng/common/pipelines/templates/steps/bypass-local-dns.yml index 8b4887870f7d..7fec974392d1 100644 --- a/eng/common/pipelines/templates/steps/bypass-local-dns.yml +++ b/eng/common/pipelines/templates/steps/bypass-local-dns.yml @@ -6,11 +6,6 @@ steps: condition: | and( succeededOrFailed(), - or( - eq(variables['OSVmImage'], 'ubuntu-18.04'), - eq(variables['OSVmImage'], 'ubuntu-20.04'), - eq(variables['OSVmImage'], 'MMSUbuntu18.04'), - eq(variables['OSVmImage'], 'MMSUbuntu20.04') - ), + contains(variables['OSVmImage'], 'ubunutu'), eq(variables['Container'], '') ) From ebcb66fd25eb5f7281e73c46fb9eccd70aac8d85 Mon Sep 17 00:00:00 2001 From: Praveen Kuttappan Date: Mon, 28 Jun 2021 16:36:42 -0400 Subject: [PATCH 2/2] Fix typo --- eng/common/pipelines/templates/steps/bypass-local-dns.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/bypass-local-dns.yml b/eng/common/pipelines/templates/steps/bypass-local-dns.yml index 7fec974392d1..922f58a8286c 100644 --- a/eng/common/pipelines/templates/steps/bypass-local-dns.yml +++ b/eng/common/pipelines/templates/steps/bypass-local-dns.yml @@ -6,6 +6,6 @@ steps: condition: | and( succeededOrFailed(), - contains(variables['OSVmImage'], 'ubunutu'), + contains(variables['OSVmImage'], 'ubuntu'), eq(variables['Container'], '') )