Update references to the default branch (#6149)

This change updates references to this repo's default branch ("master" to "main") in YAML pipelines, markdown documents, scripts, and code comments in this repo. It also updates references to other repos where the default branch has been renamed.
Azure · Feb 23, 2022 · 04ee975 · 04ee975
1 parent 5416369
commit 04ee975
Show file tree

Hide file tree

Showing 46 changed files with 109 additions and 112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,7 +88,7 @@ From: AzSec@microsoft.com
 [Ss][Yy][Ss][Pp][Rr][Ee][Pp].[Ii][Nn][Ff]
 
 ###
-From: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+From: https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 Commit: 5130d9a5060fcaed8f7458a8717b5573f5562774
 ###
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # IoT Edge
 
-[![Build Status](https://msazure.visualstudio.com/One/_apis/build/status/Custom/Azure/IoT/Edge/Core/Azure-IoT-Edge-Core%20CI?branchName=master)](https://msazure.visualstudio.com/One/_build/latest?definitionId=45137&branchName=master)
+[![Build Status](https://dev.azure.com/msazure/One/_apis/build/status/Custom/Azure/IoT/Edge/Core/Azure-IoT-Edge-Core%20CI?branchName=main)](https://dev.azure.com/msazure/One/_build/latest?definitionId=45137&branchName=main)
 
 Welcome to the home of IoT Edge.
 

diff --git a/builds/checkin/api-proxy.yaml b/builds/checkin/api-proxy.yaml
@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 jobs:

diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml
@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 jobs:

diff --git a/builds/checkin/e2e-checkin.yaml b/builds/checkin/e2e-checkin.yaml
@@ -7,17 +7,17 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: 'master'
+    branch: 'main'
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: 'master'
+    branch: 'main'
 
 stages:
 

diff --git a/builds/checkin/edgelet.yaml b/builds/checkin/edgelet.yaml
@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 jobs:

diff --git a/builds/checkin/mqtt.yaml b/builds/checkin/mqtt.yaml
@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 jobs:

diff --git a/builds/checkin/rust-test-modules.yaml b/builds/checkin/rust-test-modules.yaml
@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 jobs:

diff --git a/builds/checkin/watchdog.yaml b/builds/checkin/watchdog.yaml
@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 jobs:
 

diff --git a/builds/ci/dotnet.yaml b/builds/ci/dotnet.yaml
@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
 pr: none
 variables:

diff --git a/builds/ci/edgelet.yaml b/builds/ci/edgelet.yaml
@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
 pr: none
 

diff --git a/builds/ci/mqtt.yaml b/builds/ci/mqtt.yaml
@@ -1,7 +1,7 @@
 trigger:
   branches:
     include:
-      - master
+      - main
       - release/*
   paths:
     include:

diff --git a/builds/e2e/connectivity.yaml b/builds/e2e/connectivity.yaml
@@ -1,14 +1,14 @@
 trigger: none
 pr: none
 
-# Test schedule the same between master and release/1.2, but offset 12 hours. 
+# Test schedule the same between main and release/1.2, but offset 12 hours. 
 # Don't run any scheduled tests on Sunday, as release/1.1 runs its scheduled tests then.
 schedules:
 - cron: "0 0 * * 1,2,3,4,5,6"
-  displayName: Daily build master
+  displayName: Daily build main
   branches:
     include:
-    - master
+    - main
   always: true
 - cron: "0 12 * * 1,2,3,4,5,6"
   displayName: Daily build release/1.2
@@ -24,10 +24,10 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: 'master'
+    branch: 'main'
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: 'master'
+    branch: 'main'
 
 jobs:
 ################################################################################

diff --git a/builds/e2e/e2e.yaml b/builds/e2e/e2e.yaml
@@ -5,17 +5,17 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: 'master'
+    branch: 'main'
     trigger:
       branches:
-      - master
+      - main
       - release/*
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: 'master'
+    branch: 'main'
     trigger:
       branches:
-      - master
+      - main
       - release/*
 
 variables:

diff --git a/builds/e2e/isa-95-smoke-test.yaml b/builds/e2e/isa-95-smoke-test.yaml
@@ -1,13 +1,13 @@
 trigger: none
 pr: none
 
-# Test schedule the same between master and release/1.2, but offset 12 hours.
+# Test schedule the same between main and release/1.2, but offset 12 hours.
 schedules:
 - cron: "0 0 * * *"
-  displayName: Daily build master
+  displayName: Daily build main
   branches:
     include:
-    - master
+    - main
   always: true
 - cron: "0 12 * * *"
   displayName: Daily build release/1.2
@@ -25,10 +25,10 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: 'master'
+    branch: 'main'
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: 'master'
+    branch: 'main'
 
 stages:
 - stage: LockAgents 

diff --git a/builds/e2e/nested-connectivity.yaml b/builds/e2e/nested-connectivity.yaml
@@ -5,13 +5,13 @@ pr: none
 # Thus the schedules between these pipelines are offset by 6 hours.
 # This will ensure that enough agents are avaiable to service all tests.
 # 
-# Test schedule the same between master and release/1.2, but offset 12 hours. 
+# Test schedule the same between main and release/1.2, but offset 12 hours. 
 schedules:
 - cron: "0 0 * * *"
-  displayName: Daily build master
+  displayName: Daily build main
   branches:
     include:
-    - master
+    - main
   always: true
 - cron: "0 12 * * *"
   displayName: Daily build release/1.2
@@ -24,10 +24,10 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: 'master'
+    branch: 'main'
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: 'master'
+    branch: 'main'
 
 stages:
 - stage: LockAgents 

diff --git a/builds/e2e/nested-e2e.yaml b/builds/e2e/nested-e2e.yaml
@@ -5,13 +5,13 @@ pr: none
 # Thus the schedules between these pipelines are offset by 6 hours.
 # This will ensure that enough agents are avaiable to service all tests.
 #
-# Test schedule the same between master and release/1.2, but offset 12 hours. 
+# Test schedule the same between main and release/1.2, but offset 12 hours. 
 schedules:
 - cron: "0 6 * * *"
-  displayName: Daily build master
+  displayName: Daily build main
   branches:
     include:
-    - master
+    - main
   always: true
 - cron: "0 18 * * *"
   displayName: Daily build release/1.2
@@ -35,10 +35,10 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: 'master'
+    branch: 'main'
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: 'master'
+    branch: 'main'
 
 stages:
 - stage: LockAgents 

diff --git a/builds/e2e/nested-longhaul.yaml b/builds/e2e/nested-longhaul.yaml
@@ -5,10 +5,10 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Build Images'
-    branch: master
+    branch: main
   - pipeline: packages
     source: 'Azure-IoT-Edge-Core Edgelet Packages'
-    branch: master
+    branch: main
 
 stages:
 - stage: SetupAgents 

diff --git a/builds/e2e/proxy/proxy-deployment-template.json b/builds/e2e/proxy/proxy-deployment-template.json
@@ -26,19 +26,19 @@
 			"type": "bool"
 		},
 		"linux_vm_creation_template_uri": {
-			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/proxy/create-linux-vm-template.json",
+			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/proxy/create-linux-vm-template.json",
 			"type": "string"
 		},
 		"proxy_config_script_uri": {
-			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/proxy/configure_proxy.sh",
+			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/proxy/configure_proxy.sh",
 			"type": "string"
 		},
 		"runner_config_script_uri": {
-			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/proxy/configure_runner.sh",
+			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/proxy/configure_runner.sh",
 			"type": "string"
 		},
 		"create_ssh_keys_script_uri": {
-			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/proxy/create_ssh_keys.sh",
+			"defaultValue": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/proxy/create_ssh_keys.sh",
 			"type": "string"
 		}
 	},

diff --git a/builds/misc/images-mqtt.yaml b/builds/misc/images-mqtt.yaml
@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
   paths:
     include:
       - "mqtt/*"

diff --git a/builds/misc/images-publish.yaml b/builds/misc/images-publish.yaml
@@ -13,7 +13,7 @@ resources:
   pipelines:
   - pipeline: images
     source: 'Azure-IoT-Edge-Core Images Release YAML'
-    branch: 'master'
+    branch: 'main'
 
 jobs:
 ################################################################################

diff --git a/builds/misc/images.yaml b/builds/misc/images.yaml
@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
 pr: none
 

diff --git a/builds/misc/mqtt-perf.yaml b/builds/misc/mqtt-perf.yaml
@@ -22,7 +22,7 @@ schedules:
     displayName: Pacific Time (UTC-7) Nightly Build
     branches:
       include:
-      - master
+      - main
     always: true
 
 # github repo for our fork of mqtt-benchmark tool.

diff --git a/builds/misc/packages.yaml b/builds/misc/packages.yaml
@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
 pr: none
 
 stages:

diff --git a/builds/service/service-deployment.yaml b/builds/service/service-deployment.yaml
@@ -7,7 +7,7 @@ schedules:
   displayName: Nightly build
   branches:
     include:
-    - master
+    - main
   always: true
 
 pool:

diff --git a/doc/IoTEdgeManifestTrust.md b/doc/IoTEdgeManifestTrust.md
@@ -4,17 +4,17 @@ IoT Edge Deployment Trust is a feature which provides data integrity of the depl
 To get started, follow the steps of the quick start guide of deploying modules to an IoT edge device as shown in this [link](https://docs.microsoft.com/en-us/azure/iot-edge/quickstart-linux?view=iotedge-2020-11). Follow the step where a review of the deployment of the module is done as shown in [this](https://docs.microsoft.com/en-us/azure/iot-edge/quickstart-linux?view=iotedge-2020-11#review-and-create) step. Do not click **Review + create** but note down the image URL of all the modules that needs to be deployed to the device. Now get another Linux device which is different from the IoT edge device where the images are signed and published by following the steps below.
 
 ### 1. Notary Content Trust to protect module images
-Get the container images downloaded into the machine which are configured in the deployment JSON by using  `docker pull`. First the module container image's data integrity must be protected by using Notary Content Trust as shown in the first three steps in [this](https://github.com/Azure/iotedge/blob/master/doc/NotaryContentTrust.md) document.
+Get the container images downloaded into the machine which are configured in the deployment JSON by using  `docker pull`. First the module container image's data integrity must be protected by using Notary Content Trust as shown in the first three steps in [this](https://github.com/Azure/iotedge/blob/main/doc/NotaryContentTrust.md) document.
 
 Once the module images are signed and published in the private Azure Container Registry, the registry server name and its credentials are updated in the deployment JSON as shown in the **Set modules** step in this [link](https://docs.microsoft.com/en-us/azure/iot-edge/quickstart-linux?view=iotedge-2020-11#modules). Again copy the Deployment JSON with the updated credentials of the Azure Container Registry which is used in the next step.
 
 ### 2. Sign the deployment Manifest
-Once the deployment JSON is updated with the registry credential details, now the Manifest Signer Client tool is used to sign the deployment manifest JSON. Follow the first three steps in [this](https://github.com/Azure/iotedge/blob/master/samples/dotnet/ManifestSignerClient/Readme.md). After this we have a signed deployment JSON ready to be deployed. 
+Once the deployment JSON is updated with the registry credential details, now the Manifest Signer Client tool is used to sign the deployment manifest JSON. Follow the first three steps in [this](https://github.com/Azure/iotedge/blob/main/samples/dotnet/ManifestSignerClient/Readme.md). After this we have a signed deployment JSON ready to be deployed. 
 
 ### 3. Configure the IoT edge Daemon in Edge device.
-Configure the IoT Edge Daemon to enable Notary Content Trust as shown in step 4 of [this](https://github.com/Azure/iotedge/blob/master/doc/NotaryContentTrust.md) document.
+Configure the IoT Edge Daemon to enable Notary Content Trust as shown in step 4 of [this](https://github.com/Azure/iotedge/blob/main/doc/NotaryContentTrust.md) document.
 
-Configure the IoT Edge Daemon to enable ManifestS Signing as shown in step 4 of [this](https://github.com/Azure/iotedge/blob/master/samples/dotnet/ManifestSignerClient/Readme.md) document.
+Configure the IoT Edge Daemon to enable ManifestS Signing as shown in step 4 of [this](https://github.com/Azure/iotedge/blob/main/samples/dotnet/ManifestSignerClient/Readme.md) document.
 
 ### 4. Deploy the Deployment JSON
 Once all the configurations are in place, deploy the signed deployment JSON from step 2 using Azure CLI tools. Example [here](https://docs.microsoft.com/en-us/cli/azure/iot/edge/deployment?view=azure-cli-latest). Now the modules status can be viewed by following the reminder of the quick start guide from this [link](https://docs.microsoft.com/en-us/azure/iot-edge/quickstart-linux?view=iotedge-2020-11#view-generated-data)
diff --git a/doc/NotaryContentTrust.md b/doc/NotaryContentTrust.md
@@ -28,7 +28,7 @@ To publish signed images, following tools must be installed in a publisher's env
 3. Docker client - to sign the image and publish to the Container Registry
 
 ##### b. Generate Certificates 
-Follow instructions in [iotedge repository]([https://github.com/ggjjj/iotedge/blob/master/edgelet/doc/devguide.md](https://github.com/ggjjj/iotedge/blob/master/edgelet/doc/devguide.md)) to install OpenSSL. There are two types of certificates to be generated.
+Follow instructions in [iotedge repository]([https://github.com/Azure/iotedge/blob/main/edgelet/doc/devguide.md](https://github.com/Azure/iotedge/blob/main/edgelet/doc/devguide.md)) to install OpenSSL. There are two types of certificates to be generated.
 1. root CA for each container registry
 2. root certificate for each container image
 
@@ -131,9 +131,9 @@ To check if the image is signed or not, `az` tools can be used. Before that logi
 
 The root CA of each Container Registry i.e `root_ca_exampleregistry.crt` must be copied out of band into the device in a specific location.
 
-In the `config.yaml`, in the Moby runtime section, content trust can be enabled by specifiying the registry server name and certificate ID of the root CA as shown in [sample](https://github.com/Azure/iotedge/blob/master/edgelet/iotedge/test-files/init/import/moby-runtime-content-trust/edged.yaml)
+In the `config.yaml`, in the Moby runtime section, content trust can be enabled by specifiying the registry server name and certificate ID of the root CA as shown in [sample](https://github.com/Azure/iotedge/blob/main/edgelet/iotedge/test-files/init/import/moby-runtime-content-trust/edged.yaml)
 
-In the `super-config.toml`, under `moby_runtime.content_trust.ca_certs`, the mapping of the certificate ID and file path of the root CA must be configured as shown in [sample](https://github.com/Azure/iotedge/blob/master/edgelet/iotedge/test-files/config/moby-runtime-content-trust/super-config.toml#L56)
+In the `super-config.toml`, under `moby_runtime.content_trust.ca_certs`, the mapping of the certificate ID and file path of the root CA must be configured as shown in [sample](https://github.com/Azure/iotedge/blob/main/edgelet/iotedge/test-files/config/moby-runtime-content-trust/super-config.toml#L56)
 
 Recommendation is to create another Service Principal with Pull access for the edge device and ensure the login credentials are applied in the deployment manifest.