Skip to content

Commit

Permalink
prepare for master to main rename. commit this PR after the rename ha…
Browse files Browse the repository at this point in the history
…s finished (#19331)
  • Loading branch information
scbedd authored Jun 18, 2021
1 parent f3bceec commit d393021
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion scripts/auto_release/main.py
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'])
2 changes: 1 addition & 1 deletion scripts/devops_tasks/test_regression.py
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
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

0 comments on commit d393021

Please sign in to comment.