diff --git a/go.mod b/go.mod
index c6dc5e0f..d934d995 100644
--- a/go.mod
+++ b/go.mod
@@ -16,8 +16,8 @@ require (
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/code-generator v0.18.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
- knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2
- knative.dev/test-infra v0.0.0-20200505192244-75864c82db21
+ knative.dev/pkg v0.0.0-20200506001744-478962f05e2b
+ knative.dev/test-infra v0.0.0-20200506045344-e71b1288c15c
)
replace (
diff --git a/go.sum b/go.sum
index 6bd20072..46af38b3 100644
--- a/go.sum
+++ b/go.sum
@@ -1372,6 +1372,8 @@ knative.dev/pkg v0.0.0-20200504180943-4a2ba059b008 h1:ta/5dsSVJZuuilpa84232sHBiP
knative.dev/pkg v0.0.0-20200504180943-4a2ba059b008/go.mod h1:1RvwKBbKqKYt5rgI4lfYdWCdtXgMxJY73QxPb3jZPC4=
knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2 h1:Qu2NlOHb9p3g+CSL/ok9+FySowN60URFEKRSXfWtDv4=
knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaCXJGgY8f90BmNBKSb8z6d/BTM=
+knative.dev/pkg v0.0.0-20200506001744-478962f05e2b h1:SFCuEj+NeA8dVn4Ms1ymfF4FUru8jc7D56L17Co1qe8=
+knative.dev/pkg v0.0.0-20200506001744-478962f05e2b/go.mod h1:9UQS6bJECqqFG0q9BPaATbcG78co0s9Q6Dzo/6mR4uI=
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde h1:QSzxFsf21WXNhODvh0jRKbFR+c5UI7WFjiISy/sMOLg=
knative.dev/test-infra v0.0.0-20200430225942-f7c1fafc1cde/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
@@ -1379,6 +1381,8 @@ knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55 h1:Ajn44+eHHjPQL/BQicj
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
knative.dev/test-infra v0.0.0-20200505192244-75864c82db21 h1:SsvqMKpvrn7cl7UqRUIT90SXDowHzpzHwHaTu+wN70s=
knative.dev/test-infra v0.0.0-20200505192244-75864c82db21/go.mod h1:AqweEMgaMbb2xmYq9ZOPsH/lQ61qNx2XGr5tGltj5QU=
+knative.dev/test-infra v0.0.0-20200506045344-e71b1288c15c h1:GfRICwJBY2VmbzFzu/se73+gsfKEkc83qlTBcohJvN0=
+knative.dev/test-infra v0.0.0-20200506045344-e71b1288c15c/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE=
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/pkg/hack/generate-knative.sh b/vendor/knative.dev/pkg/hack/generate-knative.sh
index cbd95707..931e0a42 100644
--- a/vendor/knative.dev/pkg/hack/generate-knative.sh
+++ b/vendor/knative.dev/pkg/hack/generate-knative.sh
@@ -46,13 +46,6 @@ APIS_PKG="$3"
GROUPS_WITH_VERSIONS="$4"
shift 4
-(
- # To support running this script from anywhere, we have to first cd into this directory
- # so we can install the tools.
- cd $(dirname "${0}")
- go install ../codegen/cmd/injection-gen
-)
-
function codegen::join() { local IFS="$1"; shift; echo "$*"; }
# enumerate group versions
@@ -89,7 +82,7 @@ if grep -qw "injection" <<<"${GENS}"; then
# Clear old injection
rm -rf ${OUTPUT_PKG}
- ${GOPATH}/bin/injection-gen \
+ go run knative.dev/pkg/codegen/cmd/injection-gen \
--input-dirs $(codegen::join , "${FQ_APIS[@]}") \
--versioned-clientset-package ${VERSIONED_CLIENTSET_PKG} \
--external-versions-informers-package ${EXTERNAL_INFORMER_PKG} \
diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh
index 108d8e64..d049c42c 100644
--- a/vendor/knative.dev/pkg/hack/update-codegen.sh
+++ b/vendor/knative.dev/pkg/hack/update-codegen.sh
@@ -24,8 +24,6 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/library.sh
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 $(dirname $0)/../vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
-go install $(dirname $0)/../vendor/k8s.io/code-generator/cmd/deepcopy-gen
-
# generate the code with:
# --output-base because this script should also be able to run inside the vendor dir of
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
@@ -64,7 +62,7 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
# Depends on generate-groups.sh to install bin/deepcopy-gen
-${GOPATH}/bin/deepcopy-gen --input-dirs \
+go run k8s.io/code-generator/cmd/deepcopy-gen --input-dirs \
$(echo \
knative.dev/pkg/apis \
knative.dev/pkg/tracker \
diff --git a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh
index 917f5ebf..01b2d0e4 100644
--- a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh
+++ b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh
@@ -167,11 +167,11 @@ function resolve_k8s_version() {
local gke_versions=($(echo -n "${versions//;/ }"))
echo "Available GKE versions in $2 are [${versions//;/, }]"
if [[ "${target_version}" == "gke-latest" ]]; then
- # Get first (latest) version, excluding the "-gke.#" suffix
+ # Get first (latest) version
E2E_CLUSTER_VERSION="${gke_versions[0]}"
echo "Using latest version, ${E2E_CLUSTER_VERSION}"
else
- local latest="$(echo "${gke_versions[@]}" | tr ' ' '\n' | grep -E ^${target_version} | cut -f1 -d- | sort | tail -1)"
+ local latest="$(echo "${gke_versions[@]}" | tr ' ' '\n' | grep -E ^${target_version} | sort -V | tail -1)"
if [[ -z "${latest}" ]]; then
echo "ERROR: version ${target_version} is not available"
return 1
diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh
index 34e9c6aa..7933cc8b 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.
@@ -515,31 +498,43 @@ function start_latest_knative_eventing() {
# $3..$n - parameters passed to the tool.
function run_go_tool() {
local tool=$2
- local action=get
- [[ $1 =~ ^[\./].* ]] && action=install
- # Avoid running `go get` from root dir of the repository, as it can change go.sum and go.mod files.
- # See discussions in https://github.com/golang/go/issues/27643.
- if [[ -z "$(which ${tool})" ]]; then
- local action=get
- [[ $1 =~ ^[\./].* ]] && action=install
+ local install_failed=0
+ local action="get"
+ [[ $1 =~ ^[\./].* ]] && action="install"
+ # Install the tool in the following situations:
+ # - The tool does not exist.
+ # - The tool needs to be installed from a local path.
+ # - Version of the tool is specificied in the given tool path.
+ # TODO(chizhg): derive a better versioning story for the tools being used.
+ if [[ -z "$(which "${tool}")" || "${action}" == "install" || "${tool}" =~ "@" ]]; then
# Avoid running `go get` from root dir of the repository, as it can change go.sum and go.mod files.
# See discussions in https://github.com/golang/go/issues/27643.
if [[ ${action} == "get" && $(pwd) == "${REPO_ROOT_DIR}" ]]; then
local temp_dir="$(mktemp -d)"
- local install_failed=0
# Swallow the output as we are returning the stdout in the end.
pushd "${temp_dir}" > /dev/null 2>&1
GOFLAGS="" go ${action} $1 || install_failed=1
popd > /dev/null 2>&1
- (( install_failed )) && return ${install_failed}
else
- GOFLAGS="" go ${action} $1
+ GOFLAGS="" go ${action} $1 || install_failed=1
fi
fi
+ (( install_failed )) && return ${install_failed}
shift 2
${tool} "$@"
}
+# Run "kntest" tool
+# Parameters: $1..$n - parameters passed to the tool
+function run_kntest() {
+ if [[ "${REPO_NAME}" == "test-infra" ]]; then
+ go run "${REPO_ROOT_DIR}"/kntest/cmd/kntest "$@"
+ else
+ # Always run the latest version.
+ run_go_tool knative.dev/test-infra/kntest/cmd/kntest@master "$@"
+ fi
+}
+
# 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 98f5f3ea..22e72cd1 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -653,7 +653,7 @@ k8s.io/kube-openapi/pkg/util/sets
k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/trace
-# knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2
+# knative.dev/pkg v0.0.0-20200506001744-478962f05e2b
knative.dev/pkg/apis
knative.dev/pkg/changeset
knative.dev/pkg/codegen/cmd/injection-gen
@@ -670,7 +670,7 @@ knative.dev/pkg/logging/logkey
knative.dev/pkg/metrics
knative.dev/pkg/metrics/metricskey
knative.dev/pkg/reconciler
-# knative.dev/test-infra v0.0.0-20200505192244-75864c82db21
+# knative.dev/test-infra v0.0.0-20200506045344-e71b1288c15c
knative.dev/test-infra/scripts
knative.dev/test-infra/tools/dep-collector
# sigs.k8s.io/yaml v1.1.0