diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 01e66bd248b5..adaadc9f99f7 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -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']) diff --git a/scripts/devops_tasks/test_regression.py b/scripts/devops_tasks/test_regression.py index b8dc613e624a..0ec35ee92348 100644 --- a/scripts/devops_tasks/test_regression.py +++ b/scripts/devops_tasks/test_regression.py @@ -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" diff --git a/sdk/containerregistry/azure-mgmt-containerregistry/tests/disable_test_mgmt_containerregistry_2018_02_01_preview.py b/sdk/containerregistry/azure-mgmt-containerregistry/tests/disable_test_mgmt_containerregistry_2018_02_01_preview.py index 52978845426d..e8298d6a3f60 100644 --- a/sdk/containerregistry/azure-mgmt-containerregistry/tests/disable_test_mgmt_containerregistry_2018_02_01_preview.py +++ b/sdk/containerregistry/azure-mgmt-containerregistry/tests/disable_test_mgmt_containerregistry_2018_02_01_preview.py @@ -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, @@ -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)