Skip to content

Commit

Permalink
update test-infra to stop using serving.yaml (#876)
Browse files Browse the repository at this point in the history
  • Loading branch information
chizhg authored and rhuss committed Jun 8, 2020
1 parent 12dd17f commit 6b21f2d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion scripts/test-infra/COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e406de9f65c4ae5cbb2cc217656d8f6fd546ea1d
4b5d9e1bbdbe9fbd055f0e56e9ff67a9960ee72a
20 changes: 14 additions & 6 deletions scripts/test-infra/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -449,14 +449,18 @@ function report_go_test() {
}

# Install Knative Serving in the current cluster.
# Parameters: $1 - Knative Serving manifest.
# Parameters: $1 - Knative Serving crds manifest.
# $2 - Knative Serving core manifest.
# $3 - Knative net-istio manifest.
function start_knative_serving() {
header "Starting Knative Serving"
subheader "Installing Knative Serving"
echo "Installing Serving CRDs from $1"
kubectl apply --selector knative.dev/crd-install=true -f "$1"
echo "Installing the rest of serving components from $1"
kubectl apply -f "$1"
echo "Installing Serving core components from $2"
kubectl apply -f "$2"
echo "Installing net-istio components from $3"
kubectl apply -f "$3"
wait_until_pods_running knative-serving || return 1
}

Expand All @@ -478,12 +482,14 @@ function start_knative_monitoring() {
# Install the stable release Knative/serving in the current cluster.
# Parameters: $1 - Knative Serving version number, e.g. 0.6.0.
function start_release_knative_serving() {
start_knative_serving "https://storage.googleapis.com/knative-releases/serving/previous/v$1/serving.yaml"
start_knative_serving "https://storage.googleapis.com/knative-releases/serving/previous/v$1/serving-crds.yaml" \
"https://storage.googleapis.com/knative-releases/serving/previous/v$1/serving-core.yaml" \
"https://storage.googleapis.com/knative-releases/net-istio/previous/v$1/net-istio.yaml"
}

# Install the latest stable Knative Serving in the current cluster.
function start_latest_knative_serving() {
start_knative_serving "${KNATIVE_SERVING_RELEASE}"
start_knative_serving "${KNATIVE_SERVING_RELEASE_CRDS}" "${KNATIVE_SERVING_RELEASE_CORE}" "${KNATIVE_NET_ISTIO_RELEASE}"
}

# Install Knative Eventing in the current cluster.
Expand Down Expand Up @@ -742,6 +748,8 @@ readonly _TEST_INFRA_SCRIPTS_DIR="$(dirname $(get_canonical_path ${BASH_SOURCE[0
readonly REPO_NAME_FORMATTED="Knative $(capitalize ${REPO_NAME//-/ })"

# Public latest nightly or release yaml files.
readonly KNATIVE_SERVING_RELEASE="$(get_latest_knative_yaml_source "serving" "serving")"
readonly KNATIVE_SERVING_RELEASE_CRDS="$(get_latest_knative_yaml_source "serving" "serving-crds")"
readonly KNATIVE_SERVING_RELEASE_CORE="$(get_latest_knative_yaml_source "serving" "serving-core")"
readonly KNATIVE_NET_ISTIO_RELEASE="$(get_latest_knative_yaml_source "net-istio" "net-istio")"
readonly KNATIVE_EVENTING_RELEASE="$(get_latest_knative_yaml_source "eventing" "eventing")"
readonly KNATIVE_MONITORING_RELEASE="$(get_latest_knative_yaml_source "serving" "monitoring")"
2 changes: 1 addition & 1 deletion test/e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ smoke_test() {
}

# Fire up
run $@
run $@

0 comments on commit 6b21f2d

Please sign in to comment.