diff --git a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml index 3e07b3d3f6..8c4df184ff 100644 --- a/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/binary-size-checks-pipeline.yml @@ -61,8 +61,8 @@ jobs: - task: AzureCLI@2 displayName: 1a. Publish binary size data - # only publish size data for CI builds on master - condition: and(succeededOrFailed(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + # only publish size data for CI builds on main + condition: and(succeededOrFailed(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: azureSubscription: AIInfraBuild scriptLocation: inlineScript diff --git a/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-daily-perf-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-daily-perf-pipeline.yml index b347ede296..893cbe414d 100644 --- a/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-daily-perf-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/linux-gpu-tensorrt-daily-perf-pipeline.yml @@ -120,7 +120,7 @@ jobs: project: 'Lotus' preferTriggeringPipeline: true pipeline: '841' - runBranch: 'ref/heads/master' + runBranch: 'ref/heads/main' buildVersionToDownload: 'latest' allowPartiallySucceededBuilds: false artifact: 'onnxruntime_gpu' diff --git a/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml b/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml deleted file mode 100644 index 2b8dbf34fe..0000000000 --- a/tools/ci_build/github/azure-pipelines/nuget/gpu-esrp-pipeline.yml +++ /dev/null @@ -1,17 +0,0 @@ -schedules: -- cron: "0 8 * * *" - displayName: Daily Build - branches: - include: - - master - always: true - -variables: - PackageName: 'Microsoft.ML.OnnxRuntime.Gpu' - TESTONGPU: 'ON' - -jobs: -- template: templates/gpu.yml - parameters: - AgentPool : 'onnxruntime-gpu-winbuild' - DoEsrp: 'true' diff --git a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml index 11fbe89655..afdd5f5040 100644 --- a/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/orttraining-py-packaging-pipeline-cpu.yml @@ -2,7 +2,7 @@ trigger: none variables: - name: isMain - value: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/master') }} + value: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/main') }} - name: finalStorage ${{ if eq(variables['isMain'], 'true') }}: value: '--final_storage' diff --git a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml index 95a47598ce..5895f3eaa2 100644 --- a/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml +++ b/tools/ci_build/github/azure-pipelines/post-merge-jobs.yml @@ -53,7 +53,7 @@ jobs: value: true dependsOn: - CodeCoverage - condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) steps: - checkout: self submodules: false diff --git a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml index 415deb46dd..6d871115c4 100644 --- a/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml +++ b/tools/ci_build/github/azure-pipelines/templates/c-api-cpu.yml @@ -845,7 +845,7 @@ jobs: - name: GDN_CODESIGN_TARGETDIRECTORY value: '$(Build.BinariesDirectory)/nuget-artifact/final-package' pool: 'Win-CPU-2021' - condition: and (succeeded(), and (${{ parameters.PublishingNuget }}, eq(variables['Build.SourceBranch'], 'refs/heads/master'))) + condition: and (succeeded(), and (${{ parameters.PublishingNuget }}, eq(variables['Build.SourceBranch'], 'refs/heads/main'))) dependsOn: - NuGet_Test_Win_CPU - NuGet_Test_Linux_CPU diff --git a/tools/ci_build/github/azure-pipelines/templates/compliance.yml b/tools/ci_build/github/azure-pipelines/templates/compliance.yml index cdf0cf1f26..9f901ef3fb 100644 --- a/tools/ci_build/github/azure-pipelines/templates/compliance.yml +++ b/tools/ci_build/github/azure-pipelines/templates/compliance.yml @@ -50,7 +50,7 @@ steps: continueOnError: true - task: securedevelopmentteam.vss-secure-development-tools.build-task-uploadtotsa.TSAUpload@1 - condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) displayName: 'TSA Upload' inputs: tsaVersion: TsaV2 diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml index 1a702f1d6e..9320a7150f 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-selectable-stage.yml @@ -269,7 +269,7 @@ stages: - task: TSAUpload@2 displayName: 'TSA upload' - condition: and(and (succeeded(), eq(variables['PythonVersion'], '3.7')), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(and (succeeded(), eq(variables['PythonVersion'], '3.7')), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: GdnPublishTsaOnboard: false GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa' @@ -530,7 +530,7 @@ stages: - task: TSAUpload@2 displayName: 'TSA upload' - condition: and(and (succeeded(), eq(variables['PythonVersion'], '3.7')), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(and (succeeded(), eq(variables['PythonVersion'], '3.7')), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: GdnPublishTsaOnboard: false GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa' diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index 7f702a2988..e76e8810bd 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -584,7 +584,7 @@ stages: - task: TSAUpload@2 displayName: 'TSA upload' - condition: and(and (succeeded(), and(eq(variables['buildArch'], 'x64'), eq(variables['PythonVersion'], '3.7'))), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(and (succeeded(), and(eq(variables['buildArch'], 'x64'), eq(variables['PythonVersion'], '3.7'))), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: GdnPublishTsaOnboard: false GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa' @@ -788,7 +788,7 @@ stages: - task: TSAUpload@2 displayName: 'TSA upload' - condition: and(and (succeeded(), eq(variables['PythonVersion'], '3.7')), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and(and (succeeded(), eq(variables['PythonVersion'], '3.7')), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: GdnPublishTsaOnboard: false GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa' diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml index 47954781e8..12e1f28673 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-training-cuda-stage.yml @@ -51,7 +51,7 @@ stages: variables: - name: isMain - value: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/master') }} + value: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/main') }} - name: finalStorage ${{ if eq(variables['isMain'], 'true') }}: value: '--final_storage' diff --git a/tools/ci_build/github/azure-pipelines/templates/win-ci.yml b/tools/ci_build/github/azure-pipelines/templates/win-ci.yml index e57691f777..99b97cf184 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-ci.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-ci.yml @@ -264,7 +264,7 @@ jobs: - task: TSAUpload@2 displayName: 'TSA upload' - condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) + condition: and (succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: GdnPublishTsaOnboard: false GdnPublishTsaConfigFile: '$(Build.sourcesDirectory)\.gdn\.gdntsa' diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_0 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_0 index 2b94aced86..45e64a104a 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_0 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_0 @@ -9,7 +9,7 @@ FROM nvidia/cuda:11.4.0-cudnn8-devel-ubuntu${OS_VERSION} # ONNX Runtime Variables ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime -ARG ONNXRUNTIME_BRANCH=master +ARG ONNXRUNTIME_BRANCH=main ARG CMAKE_CUDA_ARCHITECTURES=37;50;52;60;61;70;75;80 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/code/cmake-3.21.0-linux-x86_64/bin:/opt/miniconda/bin:${PATH} diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_2 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_2 index 5551a78d70..5de2673327 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_2 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_4_tensorrt8_2 @@ -10,7 +10,7 @@ FROM nvidia/cuda:11.4.2-cudnn8-devel-ubuntu${OS_VERSION} # ONNX Runtime Variables ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime -ARG ONNXRUNTIME_BRANCH=master +ARG ONNXRUNTIME_BRANCH=main ARG CMAKE_CUDA_ARCHITECTURES=37;50;52;60;61;70;75;80 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/code/cmake-3.21.0-linux-x86_64/bin:/opt/miniconda/bin:${PATH} diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 index 2af158dc43..5d97077bff 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_cuda11_6_tensorrt8_4 @@ -9,7 +9,7 @@ FROM nvidia/cuda:11.6.1-cudnn8-devel-ubuntu20.04 # ONNX Runtime Variables ARG ONNXRUNTIME_REPO=https://github.com/Microsoft/onnxruntime -ARG ONNXRUNTIME_BRANCH=master +ARG ONNXRUNTIME_BRANCH=main ARG CMAKE_CUDA_ARCHITECTURES=37;50;52;60;61;70;75;80 ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/src/tensorrt/bin:/code/cmake-3.21.0-linux-x86_64/bin:/opt/miniconda/bin:${PATH} diff --git a/tools/ci_build/github/linux/docker/Dockerfile_manylinux2014_openvino_multipython b/tools/ci_build/github/linux/docker/Dockerfile_manylinux2014_openvino_multipython index 8b2a6da8bc..a38d8bbe3b 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile_manylinux2014_openvino_multipython +++ b/tools/ci_build/github/linux/docker/Dockerfile_manylinux2014_openvino_multipython @@ -10,7 +10,7 @@ ARG BUILD_UID=1001 ARG BUILD_USER=onnxruntimedev ARG OV_DEVICE_PRECISION="CPU_FP32" ARG ENABLE_TRAINING=true -ARG ORT_BRANCH="master" +ARG ORT_BRANCH="main" RUN adduser --uid $BUILD_UID $BUILD_USER WORKDIR /home/$BUILD_USER ENV PYTHON_EXE="/opt/python/$PYTHON_VER_PATH/bin/python$PYTHON_VERSION" diff --git a/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py b/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py index 6d003858e3..aadfaf6ff8 100644 --- a/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py +++ b/tools/ci_build/github/windows/post_binary_sizes_to_dashboard.py @@ -66,7 +66,7 @@ def write_to_db(binary_size_data, args): client = QueuedIngestClient(kcsb) fields = ["build_time", "build_id", "build_project", "commit_id", "os", "arch", "build_config", "size", "Branch"] now_str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") - branch_name = os.environ.get("BUILD_SOURCEBRANCHNAME", "master") + branch_name = os.environ.get("BUILD_SOURCEBRANCHNAME", "main") rows = [] for row in binary_size_data: rows.append(