diff --git a/go.mod b/go.mod index 73c9cb977..b3da19dc9 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( knative.dev/eventing v0.12.0 knative.dev/pkg v0.0.0-20200122022923-4e81bc3c320f knative.dev/serving v0.12.0 - knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05 + knative.dev/test-infra v0.0.0-20200131013528-ae2eca5b0518 sigs.k8s.io/yaml v1.1.0 ) diff --git a/go.sum b/go.sum index 70e9e8777..4fd51fb79 100644 --- a/go.sum +++ b/go.sum @@ -466,8 +466,8 @@ knative.dev/pkg v0.0.0-20200122022923-4e81bc3c320f h1:2FY5g9iJdlvD9tnQD5LduLiiTy knative.dev/pkg v0.0.0-20200122022923-4e81bc3c320f/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q= knative.dev/serving v0.12.0 h1:Jdtc3WwaBNhDY8n5mKwmLqldXra5RKk8FesjIR8k4ts= knative.dev/serving v0.12.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0= -knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05 h1:DALgmfmA58b52qfouySXvyHCbc692C3RJUSYNjHNG5U= -knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= +knative.dev/test-infra v0.0.0-20200131013528-ae2eca5b0518 h1:DIaqDmEkl4JqKQnVRfd2+COZaUViYs3SypZ6eOMwFi4= +knative.dev/test-infra v0.0.0-20200131013528-ae2eca5b0518/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= diff --git a/test/presubmit-integration-tests-latest-release.sh b/test/presubmit-integration-tests-latest-release.sh index 47e7cf373..ad263fd5e 100755 --- a/test/presubmit-integration-tests-latest-release.sh +++ b/test/presubmit-integration-tests-latest-release.sh @@ -16,10 +16,8 @@ # This script is used in Knative/test-infra as a custom prow job to run the # integration tests against Knative Serving / Eventing of a specific version. -# We currently take 0.10.0 for Serving and 0.10.2 for Eventing as the -# latest release version. export KNATIVE_SERVING_VERSION="0.12.0" -export KNATIVE_EVENTING_VERSION="0.11.0" +export KNATIVE_EVENTING_VERSION="0.12.0" $(dirname $0)/presubmit-tests.sh --integration-tests diff --git a/vendor/knative.dev/test-infra/scripts/README.md b/vendor/knative.dev/test-infra/scripts/README.md index 643115cdc..e6e9f3c7b 100644 --- a/vendor/knative.dev/test-infra/scripts/README.md +++ b/vendor/knative.dev/test-infra/scripts/README.md @@ -121,7 +121,7 @@ This is a helper script for Knative E2E test scripts. To use it: cluster creation in case of stockout. If defined, `E2E_CLUSTER_BACKUP_REGIONS` will be ignored thus it defaults to none. - `E2E_CLUSTER_MACHINE`: Cluster node machine type, defaults to - `n1-standard-4}`. + `e2-standard-4}`. - `E2E_MIN_CLUSTER_NODES`: Minimum number of nodes in the cluster when autoscaling, defaults to 1. - `E2E_MAX_CLUSTER_NODES`: Maximum number of nodes in the cluster when diff --git a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh index 0923a5588..3a2fa89a3 100644 --- a/vendor/knative.dev/test-infra/scripts/e2e-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/e2e-tests.sh @@ -47,7 +47,7 @@ export E2E_CLUSTER_ZONE=${E2E_CLUSTER_ZONE:-} readonly E2E_CLUSTER_BACKUP_REGIONS=${E2E_CLUSTER_BACKUP_REGIONS:-us-west1 us-east1} readonly E2E_CLUSTER_BACKUP_ZONES=${E2E_CLUSTER_BACKUP_ZONES:-} -readonly E2E_CLUSTER_MACHINE=${E2E_CLUSTER_MACHINE:-n1-standard-4} +readonly E2E_CLUSTER_MACHINE=${E2E_CLUSTER_MACHINE:-e2-standard-4} readonly E2E_GKE_ENVIRONMENT=${E2E_GKE_ENVIRONMENT:-prod} readonly E2E_GKE_COMMAND_GROUP=${E2E_GKE_COMMAND_GROUP:-beta} diff --git a/vendor/knative.dev/test-infra/scripts/library.sh b/vendor/knative.dev/test-infra/scripts/library.sh index 61d6c2d07..0c921580d 100644 --- a/vendor/knative.dev/test-infra/scripts/library.sh +++ b/vendor/knative.dev/test-infra/scripts/library.sh @@ -458,7 +458,7 @@ function start_knative_eventing() { # Install the stable release Knative/eventing in the current cluster. # Parameters: $1 - Knative Eventing version number, e.g. 0.6.0. function start_release_knative_eventing() { - start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/release.yaml" + start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing.yaml" } # Install the latest stable Knative Eventing in the current cluster. @@ -597,14 +597,19 @@ function get_canonical_path() { echo "$(cd ${path%/*} && echo $PWD/${path##*/})" } -# Returns whether the current branch is a release branch. -function is_release_branch() { +# Returns the current branch. +function current_branch() { local branch_name="" # Get the branch name from Prow's env var, see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md. # Otherwise, try getting the current branch from git. (( IS_PROW )) && branch_name="${PULL_BASE_REF:-}" [[ -z "${branch_name}" ]] && branch_name="$(git rev-parse --abbrev-ref HEAD)" - [[ ${branch_name} =~ ^release-[0-9\.]+$ ]] + echo "${branch_name}" +} + +# Returns whether the current branch is a release branch. +function is_release_branch() { + [[ $(current_branch) =~ ^release-[0-9\.]+$ ]] } # Returns the URL to the latest manifest for the given Knative project. @@ -615,19 +620,23 @@ function get_latest_knative_yaml_source() { local yaml_name="$2" # If it's a release branch, the yaml source URL should point to a specific version. if is_release_branch; then - # Get the latest tag name for the current branch, which is likely formatted as v0.5.0 - local tag_name="$(git describe --tags --abbrev=0)" - # The given repo might not have this tag, so we need to find its latest release manifest with the same major&minor version. - local major_minor="$(echo ${tag_name} | cut -d. -f1-2)" - local yaml_source_path="$(gsutil ls gs://knative-releases/${repo_name}/previous/${major_minor}.*/${yaml_name}.yaml \ + # Extract the release major&minor version from the branch name. + local branch_name="$(current_branch)" + local major_minor="${branch_name##release-}" + # Find the latest release manifest with the same major&minor version. + local yaml_source_path="$( + gsutil ls gs://knative-releases/${repo_name}/previous/v${major_minor}.*/${yaml_name}.yaml 2> /dev/null \ | sort \ | tail -n 1 \ | cut -b6-)" - echo "https://storage.googleapis.com/${yaml_source_path}" - # If it's not a release branch, the yaml source URL should be nightly build. - else - echo "https://storage.googleapis.com/knative-nightly/${repo_name}/latest/${yaml_name}.yaml" + # The version does exist, return it. + if [[ -n "${yaml_source_path}" ]]; then + echo "https://storage.googleapis.com/${yaml_source_path}" + return + fi + # Otherwise, fall back to nightly. fi + echo "https://storage.googleapis.com/knative-nightly/${repo_name}/latest/${yaml_name}.yaml" } # Initializations that depend on previous functions. diff --git a/vendor/modules.txt b/vendor/modules.txt index 41071a535..3ddf7380f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -695,7 +695,7 @@ knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1alpha1/fake knative.dev/serving/pkg/gc knative.dev/serving/pkg/network knative.dev/serving/pkg/reconciler/route/config -# knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05 +# knative.dev/test-infra v0.0.0-20200131013528-ae2eca5b0518 knative.dev/test-infra/scripts # sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/kustomize/pkg/commands/build