Publish end-to-end tests as a standalone executable

test/Microsoft.Azure.Devices.Edge.Test.Common/Context.cs

@@ -6,7 +6,6 @@ namespace Microsoft.Azure.Devices.Edge.Test.Common
     using System.IO;
     using System.Linq;
     using System.Net;
-    using Microsoft.Azure.Devices.Edge.Test.Common;
     using Microsoft.Azure.Devices.Edge.Util;
     using Microsoft.Extensions.Configuration;
 

test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeLogs.cs

@@ -13,20 +13,20 @@ public static class EdgeLogs
     {
         // Make an effort to collect logs, but swallow any exceptions to prevent tests/fixtures
         // from failing if this function fails.
-        public static async Task<IEnumerable<string>> CollectAsync(DateTime testStartTime, string filePrefix, IotedgeCli cli, CancellationToken token)
+        public static async Task<IEnumerable<string>> CollectAsync(DateTime testStartTime, string filePrefix, CancellationToken token)
         {
             var paths = new List<string>();
 
             // Save module logs
             try
             {
-                string[] output = await cli.RunAsync("list", token);
+                string[] output = await Process.RunAsync("iotedge", "list", token);
                 string[] modules = output.Select(ln => ln.Split(null as char[], StringSplitOptions.RemoveEmptyEntries).First()).Skip(1).ToArray();
 
                 foreach (string name in modules)
                 {
                     string moduleLog = $"{filePrefix}-{name}.log";
-                    output = await cli.RunAsync($"logs {name}", token, logCommand: true, logOutput: false);
+                    output = await Process.RunAsync("iotedge", $"logs {name}", token, logCommand: true, logOutput: false);
                     await File.WriteAllLinesAsync(moduleLog, output, token);
                     paths.Add(moduleLog);
                 }

test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeModule.cs

@@ -34,7 +34,7 @@ public EdgeModule(string id, string deviceId, IotHub iotHub)
             this.iotHub = iotHub;
         }
 
-        public static Task WaitForStatusAsync(IEnumerable<EdgeModule> modules, EdgeModuleStatus desired, IotedgeCli cli, CancellationToken token)
+        public static Task WaitForStatusAsync(IEnumerable<EdgeModule> modules, EdgeModuleStatus desired, CancellationToken token)
         {
             string[] moduleIds = modules.Select(m => m.Id.TrimStart('$')).Distinct().ToArray();
 
@@ -45,7 +45,7 @@ async Task WaitForStatusAsync()
                 await Retry.Do(
                     async () =>
                     {
-                        string[] output = await cli.RunAsync("list", token);
+                        string[] output = await Process.RunAsync("iotedge", "list", token);
 
                         return output
                             .Where(
@@ -89,8 +89,8 @@ static bool DaemonNotReady(string details) =>
                 desired.ToString().ToLower());
         }
 
-        public Task WaitForStatusAsync(EdgeModuleStatus desired, IotedgeCli cli, CancellationToken token) =>
-            WaitForStatusAsync(new[] { this }, desired, cli, token);
+        public Task WaitForStatusAsync(EdgeModuleStatus desired, CancellationToken token) =>
+            WaitForStatusAsync(new[] { this }, desired, token);
 
         public Task<string> WaitForEventsReceivedAsync(
             DateTime seekTime,

test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeRuntime.cs

@@ -3,8 +3,6 @@ namespace Microsoft.Azure.Devices.Edge.Test.Common
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
@@ -40,7 +38,6 @@ public EdgeRuntime(string deviceId, Option<string> agentImage, Option<string> hu
         // receive it and start up all the modules.
         public async Task<EdgeDeployment> DeployConfigurationAsync(
             Action<EdgeConfigBuilder> addConfig,
-            IotedgeCli cli,
             CancellationToken token,
             bool nestedEdge)
         {
@@ -79,12 +76,12 @@ public async Task<EdgeDeployment> DeployConfigurationAsync(
             EdgeModule[] modules = edgeConfiguration.ModuleNames
                 .Select(id => new EdgeModule(id, this.DeviceId, this.iotHub))
                 .ToArray();
-            await EdgeModule.WaitForStatusAsync(modules, EdgeModuleStatus.Running, cli, token);
+            await EdgeModule.WaitForStatusAsync(modules, EdgeModuleStatus.Running, token);
             await edgeConfiguration.VerifyAsync(this.iotHub, token);
             return new EdgeDeployment(deployTime, modules);
         }
 
-        public Task<EdgeDeployment> DeployConfigurationAsync(IotedgeCli cli, CancellationToken token, bool nestedEdge) =>
-            this.DeployConfigurationAsync(_ => { }, cli, token, nestedEdge);
+        public Task<EdgeDeployment> DeployConfigurationAsync(CancellationToken token, bool nestedEdge) =>
+            this.DeployConfigurationAsync(_ => { }, token, nestedEdge);
     }
 }

test/Microsoft.Azure.Devices.Edge.Test.Common/IEdgeDaemon.cs

@@ -22,7 +22,5 @@ Task ConfigureAsync(
         Task UninstallAsync(CancellationToken token);
 
         string GetCertificatesPath();
-
-        IotedgeCli GetCli();
     }
 }

test/Microsoft.Azure.Devices.Edge.Test.Common/IServiceManager.cs

@@ -10,6 +10,5 @@ public interface IServiceManager
         Task StopAsync(CancellationToken token);
         Task ConfigureAsync(CancellationToken token);
         string ConfigurationPath();
-        string GetCliName();
     }
 }

test/Microsoft.Azure.Devices.Edge.Test.Common/LeafDevice.cs

@@ -8,7 +8,6 @@ namespace Microsoft.Azure.Devices.Edge.Test.Common
     using System.IO;
     using System.Linq;
     using System.Net;
-    using System.Security.Authentication;
     using System.Security.Cryptography.X509Certificates;
     using System.Text;
     using System.Threading;
@@ -17,7 +16,6 @@ namespace Microsoft.Azure.Devices.Edge.Test.Common
     using Microsoft.Azure.Devices.Edge.Test.Common.Certs;
     using Microsoft.Azure.Devices.Edge.Test.Common.Config;
     using Microsoft.Azure.Devices.Edge.Util;
-    using Microsoft.Azure.Devices.Edge.Util.TransientFaultHandling;
     using Serilog;
 
     public class LeafDevice

test/Microsoft.Azure.Devices.Edge.Test.Common/certs/CaCertificates.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 namespace Microsoft.Azure.Devices.Edge.Test.Common.Certs
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Security.Cryptography.X509Certificates;

test/Microsoft.Azure.Devices.Edge.Test.Common/certs/FixedPaths.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 namespace Microsoft.Azure.Devices.Edge.Test.Common.Certs
 {
-    using System.IO;
-
     public sealed class FixedPaths
     {
         public sealed class DeviceIdentityCert

test/Microsoft.Azure.Devices.Edge.Test.Common/certs/TestCertificates.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 namespace Microsoft.Azure.Devices.Edge.Test.Common.Certs
 {
-    using System.IO;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Azure.Devices.Edge.Test.Common;

test/Microsoft.Azure.Devices.Edge.Test.Common/linux/EdgeDaemon.cs

@@ -62,6 +62,15 @@ void ThrowUnsupportedOs() =>
                         ? SupportedPackageExtension.Snap
                         : SupportedPackageExtension.Deb;
                     break;
+                case "ubuntu-core":
+                    if (!detectedSnap)
+                    {
+                        throw new ArgumentException(
+                            "packagesPath parameter is required on Ubuntu Core, and it must point to snap packages");
+                    }
+
+                    packageExtension = SupportedPackageExtension.Snap;
+                    break;
                 case "debian":
                     if (version != "11")
                     {
@@ -182,7 +191,7 @@ async Task InternalStartAsync(CancellationToken token)
             await Retry.Do(
                 async () =>
                 {
-                    string[] output = await this.GetCli().RunAsync("list", token);
+                    string[] output = await Process.RunAsync("iotedge", "list", token);
                     return output;
                 },
                 output => true,
@@ -245,10 +254,5 @@ await Profiler.Run(
         }
 
         public string GetCertificatesPath() => this.certsPath;
-
-        public IotedgeCli GetCli()
-        {
-            return new IotedgeCli(this.serviceManager.GetCliName());
-        }
     }
 }

test/Microsoft.Azure.Devices.Edge.Test.Common/linux/PackageManagement.cs

@@ -88,7 +88,8 @@ public string[] GetInstallCommandsFromLocal(string path)
                     "snap connect azure-iot-edge:run-iotedge",
                     "snap connect azure-iot-edge:aziotctl-executables azure-iot-identity:aziotctl-executables",
                     "snap connect azure-iot-edge:identity-service azure-iot-identity:identity-service",
-                    "snap connect azure-iot-edge:docker docker:docker-daemon"
+                    "snap connect azure-iot-edge:docker docker:docker-daemon",
+                    "snap alias azure-iot-edge.iotedge iotedge"
                 },
                 _ => throw new NotImplementedException($"Don't know how to install daemon on for '.{this.PackageExtension}'"),
             };

test/Microsoft.Azure.Devices.Edge.Test.Common/linux/SnapServiceManager.cs

@@ -51,7 +51,6 @@ await Process.RunAsync(
 
         public string ConfigurationPath() =>
             "/var/snap/azure-iot-identity/current/shared/config/aziot/config-e2e.toml";
-        public string GetCliName() => "azure-iot-edge.iotedge";
 
         async Task WaitForStatusAsync(ServiceStatus desired, CancellationToken token)
         {

test/Microsoft.Azure.Devices.Edge.Test.Common/linux/SystemdServiceManager.cs

@@ -2,7 +2,6 @@
 namespace Microsoft.Azure.Devices.Edge.Test.Common.Linux
 {
     using System;
-    using System.IO;
     using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
@@ -35,7 +34,6 @@ public async Task ConfigureAsync(CancellationToken token)
         }
 
         public string ConfigurationPath() => "/etc/aziot/config.toml";
-        public string GetCliName() => "iotedge";
 
         async Task WaitForStatusAsync(ServiceStatus desired, CancellationToken token)
         {