From 84b76c30d4d411f0037d7628a174fea2462e204f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 30 Nov 2020 14:39:50 -0800 Subject: [PATCH] Exclude bypass-local-dns step when a container variable is specified (#1011) Co-authored-by: Ben Broderick Phillips --- eng/common/pipelines/templates/steps/bypass-local-dns.yml | 7 ++++++- eng/common/pipelines/templates/steps/verify-agent-os.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/bypass-local-dns.yml b/eng/common/pipelines/templates/steps/bypass-local-dns.yml index 54f49c337..91b5c4978 100644 --- a/eng/common/pipelines/templates/steps/bypass-local-dns.yml +++ b/eng/common/pipelines/templates/steps/bypass-local-dns.yml @@ -3,4 +3,9 @@ steps: # https://github.com/actions/virtual-environments/issues/798 - script: sudo ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf displayName: Bypass local DNS server to workaround issue resolving cognitiveservices names - condition: and(succeededOrFailed(), eq(variables['OSVmImage'], 'ubuntu-18.04')) \ No newline at end of file + condition: | + and( + succeededOrFailed(), + eq(variables['OSVmImage'], 'ubuntu-18.04'), + eq(variables['Container'], '') + ) diff --git a/eng/common/pipelines/templates/steps/verify-agent-os.yml b/eng/common/pipelines/templates/steps/verify-agent-os.yml index 4551279e1..12eaa0d3e 100644 --- a/eng/common/pipelines/templates/steps/verify-agent-os.yml +++ b/eng/common/pipelines/templates/steps/verify-agent-os.yml @@ -1,4 +1,4 @@ -parameters: +parameters: OSVmImage: $(OSVmImage) steps: