complement feature vector; upload artifacts

Signed-off-by: Jason Volk <jason@zemos.net>

docker/Dockerfile.complement

@@ -22,9 +22,12 @@ COPY <<EOF v3.ext
     keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
     subjectAltName = @alt_names
     [alt_names]
+    DNS.0 = *.docker.internal
     DNS.1 = hs1
     DNS.2 = hs2
     DNS.3 = hs3
+    DNS.4 = hs4
+    IP.1 = 127.0.0.1
 EOF
 RUN <<EOF
     set -eux
@@ -38,7 +41,7 @@ RUN <<EOF
         -sha256 \
         -key private_key.pem \
         -subj "/C=US/ST=CA/O=MyOrg, Inc./CN=hs1" \
-        -addext "subjectAltName = DNS:hs1, DNS:hs2, DNS:hs3" \
+        -addext "subjectAltName = DNS:*.docker.internal DNS:hs1, DNS:hs2, DNS:hs3, DNS:hs4, IP:127.0.0.1" \
         -out signing_request.csr
 
     openssl x509 \
@@ -167,6 +170,7 @@ EOF
 
 
 FROM input AS complement-tester
+ARG complement_verbose=0
 ARG complement_debug=0
 ARG complement_count=1
 ARG complement_parallel=16
@@ -188,11 +192,12 @@ ENV complement_tests="$complement_tests"
 ENV complement_skip="$complement_skip"
 ENV complement_run="$complement_run"
 ENV complement_tests="$complement_tests"
+ENV COMPLEMENT_ALWAYS_PRINT_SERVER_LOGS="$complement_verbose"
 ENV COMPLEMENT_HOSTNAME_RUNNING_COMPLEMENT="host.docker.internal"
 ENV COMPLEMENT_HOST_MOUNTS="/var/run/docker.sock:/var/run/docker.sock"
 ENV jq_res='{Action: .Action, Test: .Test}'
 ENV jq_sel='select((.Action == \"pass\" or .Action == \"fail\" or .Action == \"skip\") and .Test != null)'
-ENV jq_tab='([\"RESULT\",\"TEST\"] | (., map(length*\"-\"))), (.[] | [.Action, .Test]) | @tsv'
+ENV jq_tab='[.Action, .Test] | @tsv'
 WORKDIR /usr/src/complement
 COPY --from=complement-config /complement/old_results.jsonl .
 COPY <<EOF uwu.sh
@@ -210,15 +215,13 @@ COPY <<EOF uwu.sh
         -skip="${complement_skip}"
         -run="${complement_run}"
         "${complement_tests}"
-    | jq -c "${jq_sel} | ${jq_res}"
+    | jq --unbuffered -c "${jq_sel} | ${jq_res}"
     | tee results.jsonl
-    | jq -s -r "${jq_tab}"
+    | jq --unbuffered -r "${jq_tab}"
     ;
 
     jq -s -c "sort_by(.Test)[]" < results.jsonl | uniq > new_results.jsonl;
-
     wc -l old_results.jsonl new_results.jsonl;
-
     diff -w -y -t --width=275 --suppress-common-lines old_results.jsonl new_results.jsonl;
 EOF
 RUN echo $(tr -d '\n' < uwu.sh) > uwu.sh

docker/bake.hcl

@@ -1,22 +1,27 @@
-variable "acct" {
-	default = "$GITHUB_ACTOR"
-}
+variable "GITHUB_ACTOR" {}
+variable "GITHUB_REPOSITORY" {}
+variable "GITHUB_REF" {}
+variable "GITHUB_REF_SHA" {}
+variable "GITHUB_REF_NAME" {}
 
+variable "acct" {
+	default = "${GITHUB_ACTOR}"
+}
 variable "repo" {
-	default = "$GITHUB_REPOSITORY"
+	default = "${GITHUB_REPOSITORY}"
 }
 variable "docker_repo" {
-	default = "$DOCKER_ID"
+	default = "${repo}"
 }
 
 variable "git_ref" {
-	default = "$GITHUB_REF"
+	default = "${GITHUB_REF}"
 }
 variable "git_ref_sha" {
-	default = "$GITHUB_REF_SHA"
+	default = "${GITHUB_REF_SHA}"
 }
 variable "git_ref_name" {
-	default = "$GITHUB_REF_NAME"
+	default = "${GITHUB_REF_NAME}"
 }
 
 cargo_feat_sets = {
@@ -33,7 +38,7 @@ variable "feat_sets" {
     default = "[\"none\", \"default\", \"all\"]"
 }
 variable "cargo_profiles" {
-    default = "[\"test\", \"bench\"]"
+    default = "[\"test\", \"release\"]"
 }
 variable "cargo_install_root" {
     default = "/usr"
@@ -554,7 +559,7 @@ target "install" {
     contexts = {
         input = elem("target:diner", [feat_set, sys_name, sys_version, sys_target])
         output = elem("target:installer", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
-        docs = elem("target:docs", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
+        #docs = elem("target:docs", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
     }
 }
 

docker/complement.sh

@@ -20,7 +20,7 @@ cargo_profile="${cargo_profile:-$default_cargo_profile}"
 feat_set="${feat_set:-$default_feat_set}"
 rust_target="${rust_target:-$default_rust_target}"
 rust_toolchain="${rust_toolchain:-$default_rust_toolchain}"
-sys_name="${sys_names:-$default_sys_name}"
+sys_name="${sys_name:-$default_sys_name}"
 sys_target="${sys_target:-$default_sys_target}"
 sys_version="${sys_version:-$default_sys_version}"
 
@@ -30,37 +30,36 @@ set +a
 
 ###############################################################################
 
+set -x
 tester_image="complement-tester--${feat_set}--${sys_name}--${sys_version}--${sys_target}"
 testee_image="complement-testee--${cargo_profile}--${rust_toolchain}--${rust_target}--${feat_set}--${sys_name}--${sys_version}--${sys_target}"
 name="complement_tester__${cargo_profile}__${rust_toolchain}__${rust_target}__${feat_set}__${sys_name}__${sys_version}__${sys_target}"
 sock="/var/run/docker.sock"
 arg="--name $name -v $sock:$sock --network=host $tester_image ${testee_image}"
+set +x
 
 if test "$CI_VERBOSE_ENV" = "true"; then
 	date
 	env
 fi
 
-if test "$CI" = "true"; then
-	arg="-d $arg"
-else
-	arg="--rm $arg"
-fi
-
 docker rm -f "$name" 2>/dev/null
 
 trap 'set +x; date; echo -e "\033[1;41;37mFAIL\033[0m"' ERR
 
-set -x -e
-cid=$(docker run $arg)
-set +x
-
 if test "$CI" = "true"; then
-	echo -n "$cid" > "$name"
+	arg="-d $arg"
+	cid=$(docker run $arg)
+else
+	arg="--rm -a stdout -a stderr $arg"
+	docker run $arg
+	exit $?
 fi
 
-trap 'docker container stop $cid; set +x; date; echo -e "\033[1;41;37mFAIL\033[0m"' INT
+echo -n "$cid" > "$name"
 
+trap 'docker container stop $cid; set +x; date; echo -e "\033[1;41;37mFAIL\033[0m"' INT
 docker logs -f "$cid"
 docker wait "$cid" 2>/dev/null
+
 echo -e "\033[1;42;30mPASS\033[0m"