Merged PR 4988349: Update ADO to c7c44e1

Related work items: microsoft#930, microsoft#962, microsoft#1004, microsoft#1008, microsoft#1039, microsoft#1045, microsoft#1046, microsoft#1047, microsoft#1052, microsoft#1053, microsoft#1054, microsoft#1057, microsoft#1058, microsoft#1060, microsoft#1061, microsoft#1063, microsoft#1064, microsoft#1068, microsoft#1069, microsoft#1070, microsoft#1071, microsoft#1074, microsoft#1078, microsoft#1079, microsoft#1081, microsoft#1082, microsoft#1083, microsoft#1084, microsoft#1088, microsoft#1090, microsoft#1091, microsoft#1093, microsoft#1094, microsoft#1096, microsoft#1098, microsoft#1099, microsoft#1102, microsoft#1103, microsoft#1105, microsoft#1106, microsoft#1108, microsoft#1109, microsoft#1115, microsoft#1116, microsoft#1122, microsoft#1123, microsoft#1126

.github/workflows/ci.yml

@@ -70,6 +70,7 @@ jobs:
       - run: go build ./cmd/ncproxy
       - run: go build ./cmd/dmverity-vhd
       - run: go build ./internal/tools/grantvmgroupaccess
+      - run: go build ./internal/tools/securitypolicy
       - run: go build ./internal/tools/uvmboot
       - run: go build ./internal/tools/zapdir
 

Makefile

@@ -29,7 +29,7 @@ clean:
 	rm -rf bin deps rootfs out
 
 test:
-	cd $(SRCROOT) && go test ./internal/guest/...
+	cd $(SRCROOT) && go test -v ./internal/guest/...
 
 out/delta.tar.gz: bin/init bin/vsockexec bin/cmd/gcs bin/cmd/gcstools Makefile
 	@mkdir -p out
@@ -84,4 +84,4 @@ bin/init: init/init.o vsockexec/vsock.o
 
 %.o: %.c
 	@mkdir -p $(dir $@)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<

cmd/containerd-shim-runhcs-v1/options/runhcs.proto

@@ -9,7 +9,8 @@ option go_package = "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/
 
 // Options are the set of customizations that can be passed at Create time.
 message Options {
-	// enable debug tracing
+	// Enable debug tracing (sets the logrus log level to debug). This may be deprecated in the future, prefer
+	// log_level as this will override debug if both of them are set.
 	bool debug = 1;
 
 	enum DebugType {
@@ -69,23 +70,29 @@ message Options {
 	// host and UVM.
 	bool scale_cpu_limits_to_sandbox = 11;
 
-	// default_container_scratch_size_in_gb is the default scratch size (sandbox.vhdx) 
+	// default_container_scratch_size_in_gb is the default scratch size (sandbox.vhdx)
 	// to be used for containers. Every container will get a sandbox of `size_in_gb` assigned
-	// instead of the default of 20GB. 
+	// instead of the default of 20GB.
 	int32 default_container_scratch_size_in_gb = 12;
 
-	// default_vm_scratch_size_in_gb is the default scratch size (sandbox.vhdx) 
-	// to be used for the UVM. This only applies to WCOW as LCOW doesn't mount a scratch 
+	// default_vm_scratch_size_in_gb is the default scratch size (sandbox.vhdx)
+	// to be used for the UVM. This only applies to WCOW as LCOW doesn't mount a scratch
 	// specifically for the UVM.
 	int32 default_vm_scratch_size_in_gb = 13;
 
-	// share_scratch specifies if we'd like to reuse scratch space between multiple containers. 
+	// share_scratch specifies if we'd like to reuse scratch space between multiple containers.
 	// This currently only affects LCOW. The sandbox containers scratch space is re-used for all
-	// subsequent containers launched in the pod.  
+	// subsequent containers launched in the pod.
 	bool share_scratch = 14;
-	//NCProxyAddr is the address of the network configuration proxy service. If omitted 
-	// the network is setup locally. 
-	string NCProxyAddr = 15; 
+
+	// NCProxyAddr is the address of the network configuration proxy service. If omitted
+	// the network is setup locally.
+	string NCProxyAddr = 15;
+
+	// log_level specifies the logrus log level for the shim. Supported values are a string representation of the
+	// logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override
+	// the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent.
+	string log_level = 16;
 }
 
 // ProcessDetails contains additional information about a process. This is the additional