Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure bypass conditional template gets run for 1es ubuntu image #1327

Merged
1 commit merged into from
Jan 21, 2021
Merged

Ensure bypass conditional template gets run for 1es ubuntu image #1327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion eng/common/pipelines/templates/steps/bypass-local-dns.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ steps:
condition: |
and(
succeededOrFailed(),
eq(variables['OSVmImage'], 'ubuntu-18.04'),
or(
eq(variables['OSVmImage'], 'ubuntu-18.04'),
eq(variables['OSVmImage'], 'MMSUbuntu18.04')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mitchdenny do we have this set for all the pipelines now? OR will this still be an issue for some that don't have an OSVmImage set yet?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if this was working before, there's no reason to think it will break now with the addition of an extra variable check. If the variable doesn't exist it will just evaluate to false.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still have some pipelines using ubuntu-18.04, specifically legs within the release side of the pipelines. So having it cover both scenarios is useful for now. And possibly going to be useful in the future when we start using Ubuntu 20.04 etc.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was fine with covering both. My question was more around did we update all the new pipelines with the new name, I know there were some where the OSVmImage name was empty and I'm not sure if you updated all those yet or not.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see

),
eq(variables['Container'], '')
)