From be60cda9bb967cc919f10e483edb63944e638333 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:50:45 +0200 Subject: [PATCH] test --- .github/workflows/e2e_servicemesh.yml | 1 + justfile | 2 +- packages/by-name/kata/kata-image/package.nix | 2 ++ packages/by-name/kata/runtime-class-files/package.nix | 1 - packages/by-name/microsoft/runtime-class-files/package.nix | 2 -- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e_servicemesh.yml b/.github/workflows/e2e_servicemesh.yml index 01f5f8e7e7..3f4d1205e6 100644 --- a/.github/workflows/e2e_servicemesh.yml +++ b/.github/workflows/e2e_servicemesh.yml @@ -26,6 +26,7 @@ jobs: contents: read packages: write steps: + - uses: katexochen/maximize-build-space@b854245e02dde1ed04010b6b2ab526905f2b4deb # btrfs - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: ./.github/actions/setup_nix with: diff --git a/justfile b/justfile index c0cc37ad52..bf6dfabe11 100644 --- a/justfile +++ b/justfile @@ -6,7 +6,7 @@ push target: #!/usr/bin/env bash set -euo pipefail mkdir -p {{ workspace_dir }} - pushedImg=$(nix run .#containers.push-{{ target }} -- "$container_registry/contrast/{{ target }}") + pushedImg=$(nix run -L .#containers.push-{{ target }} -- "$container_registry/contrast/{{ target }}") printf "ghcr.io/edgelesssys/contrast/%s:latest=%s\n" "{{ target }}" "$pushedImg" >> {{ workspace_dir }}/just.containerlookup # Build the coordinator, containerize and push it. diff --git a/packages/by-name/kata/kata-image/package.nix b/packages/by-name/kata/kata-image/package.nix index 70103668cd..f15a50bd34 100644 --- a/packages/by-name/kata/kata-image/package.nix +++ b/packages/by-name/kata/kata-image/package.nix @@ -22,6 +22,7 @@ cryptsetup, closureInfo, erofs-utils, + strace, }: let @@ -137,6 +138,7 @@ stdenv.mkDerivation rec { util-linux tdnf buildimage + strace ]; sourceRoot = "${src.name}/tools/osbuilder/rootfs-builder"; diff --git a/packages/by-name/kata/runtime-class-files/package.nix b/packages/by-name/kata/runtime-class-files/package.nix index 5c65db9f27..c6c253bbbc 100644 --- a/packages/by-name/kata/runtime-class-files/package.nix +++ b/packages/by-name/kata/runtime-class-files/package.nix @@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation { buildPhase = '' mkdir -p $out sha256sum ${image} ${kernel} ${qemu-snp.bin} ${qemu-tdx.bin} ${containerd-shim-contrast-cc-v2} ${ovmf-snp} ${ovmf-tdx} | sha256sum | cut -d " " -f 1 > $out/launch-digest.hex - printf "contrast-cc-%s" "$(cat $out/launch-digest.hex | head -c 32)" > $out/runtime-handler ''; passthru = { diff --git a/packages/by-name/microsoft/runtime-class-files/package.nix b/packages/by-name/microsoft/runtime-class-files/package.nix index 19aa1a9b4d..c895cd060a 100644 --- a/packages/by-name/microsoft/runtime-class-files/package.nix +++ b/packages/by-name/microsoft/runtime-class-files/package.nix @@ -24,8 +24,6 @@ stdenvNoCC.mkDerivation { buildPhase = '' mkdir -p $out igvmmeasure -b ${igvm} | dd conv=lcase > $out/launch-digest.hex - echo -n "contrast-cc-" > $out/runtime-handler - cat $out/launch-digest.hex | head -c 32 >> $out/runtime-handler ''; passthru = {