Skip to content

Remaining Hardcoded to master items #19331

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

Merged
Scott Beddall (scbedd) merged 1 commit into from
Jun 18, 2021
Merged

Remaining Hardcoded to master items #19331

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion scripts/auto_release/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,4 +417,4 @@ def main():
my_print(e)
else:
with open(f'{OUT_PATH}/output.txt', 'w') as file_out:
file_out.writelines([f'{NEW_BRANCH}\n', "master" if TRACK == '2' else 'release/v3'])
file_out.writelines([f'{NEW_BRANCH}\n', "main" if TRACK == '2' else 'release/v3'])

@scbedd Scott Beddall (scbedd) Jun 18, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yuchao Yan (@msyyc) please yell at me if this is an improper update. Given the context of this issue I think we're fine. Please correct me if I'm wrong!

2 changes: 1 addition & 1 deletion scripts/devops_tasks/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
test_tools_req_file = os.path.abspath(os.path.join(root_dir, "eng", "test_tools.txt"))

GIT_REPO_NAME = "azure-sdk-for-python"
GIT_MASTER_BRANCH = "master"
GIT_MASTER_BRANCH = "main"
VENV_NAME = "regressionenv"
AZURE_SDK_FOR_PYTHON_GIT_URL = "https://github.com/Azure/azure-sdk-for-python.git"
TEMP_FOLDER_NAME = ".tmp_code_path"
Expand Down
4 changes: 2 additions & 2 deletions ...re-mgmt-containerregistry/tests/disable_test_mgmt_containerregistry_2018_02_01_preview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def _create_build_task(self, build_task_name, registry_name, resource_group_name

def _create_build_step(self, build_step_name, build_task_name, registry_name, resource_group_name, location):
docker_build_step = DockerBuildStep(
branch='master',
branch='main',
image_names=['repo:tag'],
is_push_enabled=True,
no_cache=False,
Expand All @@ -294,7 +294,7 @@ def _create_build_step(self, build_step_name, build_task_name, registry_name, re
).result()

self.assertEqual(build_step.name, build_step_name)
self.assertEqual(build_step.properties.branch, 'master')
self.assertEqual(build_step.properties.branch, 'main')
self.assertEqual(build_step.properties.image_names, ['repo:tag'])
self.assertEqual(build_step.properties.is_push_enabled, True)
self.assertEqual(build_step.properties.no_cache, False)
Expand Down