From d289d2eef6cb8865f6fa8f78e60034d277f46d1f Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Tue, 16 Jun 2020 07:51:24 -0700 Subject: [PATCH] [master] Auto-update dependencies (#1413) Produced via: `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh` /assign n3wscott vagababov /cc n3wscott vagababov --- go.mod | 2 +- go.sum | 3 ++ .../knative.dev/test-infra/scripts/library.sh | 30 +++++++------------ vendor/modules.txt | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index db4353708..6f0d03a3c 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 - knative.dev/test-infra v0.0.0-20200606045118-14ebc4a42974 + knative.dev/test-infra v0.0.0-20200615231324-3a016f44102c sigs.k8s.io/boskos v0.0.0-20200530174753-71e795271860 ) diff --git a/go.sum b/go.sum index d445dd213..7e85df170 100644 --- a/go.sum +++ b/go.sum @@ -1390,6 +1390,7 @@ knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaC knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/pkg v0.0.0-20200520073958-94316e20e860/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA= knative.dev/pkg v0.0.0-20200603222317-b79e4a24ca50/go.mod h1:8IfPj/lpuKHHg82xZCl2wuFZ3BM96To72sN1W8T9wjQ= +knative.dev/pkg v0.0.0-20200611204322-2ddcfef739a2/go.mod h1:rA+FklsrVahwF4a+D63NyHJlzDoAFH81K4J5CYuE3bA= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034 h1:JxqONCZVS7or+Fv3ebVQoipuIBH7Ig3Qbx170hgIF+A= @@ -1400,6 +1401,8 @@ knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a h1:c0qTABRcNoxZVu5gsry knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a/go.mod h1:n9eQkzmSNj8BiqNFl1lzoz68D09uMeJfyOjc132Gbik= knative.dev/test-infra v0.0.0-20200606045118-14ebc4a42974 h1:CrZmlbB+j3ZF/aTrfyypY5ulX2w7XrkfeXKQsbkqzTg= knative.dev/test-infra v0.0.0-20200606045118-14ebc4a42974/go.mod h1://I6IZIF0QDgs5wotU243ZZ5cTpm6/GthayjUenBBc0= +knative.dev/test-infra v0.0.0-20200615231324-3a016f44102c h1:pzn7d3gVWX6p10CpdSFAYlgFhLwI6hGQ8H4sxQfvob4= +knative.dev/test-infra v0.0.0-20200615231324-3a016f44102c/go.mod h1:+BfrTJpc++rH30gX/C0QY6NT2eYVzycll52uw6CrQnc= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh index de059f536..1ed038116 100644 --- a/vendor/knative.dev/test-infra/scripts/library.sh +++ b/vendor/knative.dev/test-infra/scripts/library.sh @@ -389,25 +389,8 @@ function mktemp_with_extension() { # $2 - check name as an identifier (e.g., GoBuild) # $3 - failure message (can contain newlines), optional (means success) function create_junit_xml() { - local xml="$(mktemp_with_extension ${ARTIFACTS}/junit_XXXXXXXX xml)" - local failure="" - if [[ "$3" != "" ]]; then - # Transform newlines into HTML code. - # Also escape `<` and `>` as here: https://github.com/golang/go/blob/50bd1c4d4eb4fac8ddeb5f063c099daccfb71b26/src/encoding/json/encode.go#L48, - # this is temporary solution for fixing https://github.com/knative/test-infra/issues/1204, - # which should be obsolete once Test-infra 2.0 is in place - local msg="$(echo -n "$3" | sed 's/$/\ /g' | sed 's//\\u003e/' | sed 's/&/\\u0026/' | tr -d '\n')" - failure="${msg}" - fi - cat << EOF > "${xml}" - - - - ${failure} - - - -EOF + local xml="$(mktemp_with_extension "${ARTIFACTS}"/junit_XXXXXXXX xml)" + run_kntest junit --suite="$1" --name="$2" --err-msg="$3" --dest="${xml}" || return 1 } # Runs a go test and generate a junit summary. @@ -542,6 +525,15 @@ function run_go_tool() { ${tool} "$@" } +# Run kntest tool, error out and ask users to install it if it's not currently installed. +# Parameters: $1..$n - parameters passed to the tool. +function run_kntest() { + if [[ -z "$(which kntest)" ]]; then + echo "--- FAIL: kntest not installed, please clone test-infra repo and run \`go install ./kntest/cmd/kntest\` to install it"; return 1; + fi + kntest "$@" +} + # Run go-licenses to update licenses. # Parameters: $1 - output file, relative to repo root dir. # $2 - directory to inspect. diff --git a/vendor/modules.txt b/vendor/modules.txt index bcf322420..1819e123d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -924,7 +924,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/test-infra v0.0.0-20200606045118-14ebc4a42974 +# knative.dev/test-infra v0.0.0-20200615231324-3a016f44102c ## explicit knative.dev/test-infra/scripts # sigs.k8s.io/boskos v0.0.0-20200530174753-71e795271860