Skip to content

Commit

Permalink
Final touch for 1.3.0 (#6479)
Browse files Browse the repository at this point in the history
- Touch finish CHANGELOG.MD
- Update config files to be using edgeAgent from 1.3 tag
- Update autotriggers for build image/edgelet pipelines.

## Azure IoT Edge PR checklist:
  • Loading branch information
yophilav authored Jun 27, 2022
1 parent d9b0849 commit b022069
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 48 deletions.
66 changes: 29 additions & 37 deletions CHANGELOG.md

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion builds/misc/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ trigger:
batch: true
branches:
include:
- main
- release/*
pr: none

Expand Down
3 changes: 1 addition & 2 deletions builds/misc/packages-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ resources:
type: github
endpoint: azure-iot-edge-iotedge1-github
name: azure/iot-identity-service
ref: release/1.2
# TODO: Once release/1.3 is fork for IIS repo, we will need to update his parameter.
ref: release/1.3

stages:
################################################################################
Expand Down
2 changes: 1 addition & 1 deletion builds/misc/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ trigger:
batch: true
branches:
include:
- main
- release/*
pr: none

variables:
Expand Down
2 changes: 1 addition & 1 deletion edgelet/contrib/config/linux/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name = "edgeAgent"
type = "docker"

[agent.config]
image = "mcr.microsoft.com/azureiotedge-agent:1.2"
image = "mcr.microsoft.com/azureiotedge-agent:1.3"

[connect]
workload_uri = "@connect_workload_uri@"
Expand Down
2 changes: 1 addition & 1 deletion edgelet/contrib/config/linux/template.toml
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
# imagePullPolicy = "..." # "on-create" or "never". Defaults to "on-create"

# [agent.config]
# image = "mcr.microsoft.com/azureiotedge-agent:1.2"
# image = "mcr.microsoft.com/azureiotedge-agent:1.3"
# createOptions = { HostConfig = { Binds = ["/iotedge/storage:/iotedge/storage"] } }

# [agent.config.auth]
Expand Down
2 changes: 1 addition & 1 deletion edgelet/iotedge/src/config/super_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub fn default_agent() -> edgelet_settings::ModuleSpec<edgelet_settings::DockerC
/* type */ "docker".to_owned(),
/* config */
edgelet_settings::DockerConfig::new(
/* image */ "mcr.microsoft.com/azureiotedge-agent:1.2".to_owned(),
/* image */ "mcr.microsoft.com/azureiotedge-agent:1.3".to_owned(),
/* create_options */ docker::models::ContainerCreateBody::new(),
/* digest */ None,
/* auth */ None,
Expand Down
2 changes: 1 addition & 1 deletion platform-validation/scripts/aziot-compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ aziotedge_check() {

#Todo : As we add new versions, these checks will need to be changed. Keep a common check for now
case $APP_VERSION in
*) wrap_debug_message "Checking aziot-edge compatibility for Release 1.2" ;;
*) wrap_debug_message "Checking aziot-edge compatibility for Release 1.3" ;;
esac

# Keep the ordering of checks consistent, Add new checks towards the end, Since outputs of
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Microsoft.Azure.Devices.Edge.Test.Common.Config

public class AgentModuleConfigBuilder : BaseModuleConfigBuilder
{
const string DefaultImage = "mcr.microsoft.com/azureiotedge-agent:1.0";
const string DefaultImage = "mcr.microsoft.com/azureiotedge-agent:1.3";

public AgentModuleConfigBuilder(Option<string> image)
: base(ModuleName.EdgeAgent, image.GetOrElse(DefaultImage))
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.Azure.Devices.Edge.Test/SetupFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ await this.daemon.ConfigureAsync(
msgBuilder.Append("with hostname '{hostname}'");
props.Add(hostname);

string edgeAgent = Context.Current.EdgeAgentImage.GetOrElse("mcr.microsoft.com/azureiotedge-agent:1.2");
string edgeAgent = Context.Current.EdgeAgentImage.GetOrElse("mcr.microsoft.com/azureiotedge-agent:1.3");

Log.Verbose("Search parents");
Context.Current.ParentHostname.ForEach(parentHostname =>
Expand Down
2 changes: 1 addition & 1 deletion test/doc/e2e.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The end-to-end tests take several parameters, which they expect to find in a fil
|------|----------|-------------|
| `caCertScriptPath` | * | Path to the folder containing `certGen.sh` (Linux) or `ca-certs.ps1` (Windows). Required when running the test 'TransparentGateway', ignored otherwise. |
| `dpsIdScope` | * | The [ID Scope](https://docs.microsoft.com/azure/iot-dps/concepts-device#id-scope) assigned to a Device Provisioning Service. Required when running any DPS tests, ignored otherwise. |
| `edgeAgentImage` || Docker image to pull/use for Edge Agent. If not given, the default value `mcr.microsoft.com/azureiotedge-agent:1.0` is used. This setting only applies to any configurations deployed by the tests. Note also that the default value is ALWAYS used in config.yaml to start IoT Edge; this setting only applies to any configurations deployed by the tests. |
| `edgeAgentImage` || Docker image to pull/use for Edge Agent. If not given, the default value `mcr.microsoft.com/azureiotedge-agent:1.3` is used. This setting only applies to any configurations deployed by the tests. Note also that the default value is ALWAYS used in config.toml to start IoT Edge; this setting only applies to any configurations deployed by the tests. |
| `edgeHubImage` || Docker image to pull/use for Edge Hub. If not given, `mcr.microsoft.com/azureiotedge-hub:1.0` is used. |
| `edgeHubSchemaVersion` || The schema version used for EdgeHub. |
| `installerPath` || Path to the Windows installer script `IotEdgeSecurityDaemon.ps1`. This parameter is ignored on Linux, and optional on Windows. If not given on Windows, the default script will be downloaded from https://aka.ms/iotedge-win to a temporary location. |
Expand Down

0 comments on commit b022069

Please sign in to comment.