build test images for e2e

.ko.yaml

@@ -0,0 +1,4 @@
+# Use :nonroot base image for all containers
+defaultBaseImage: gcr.io/distroless/base:debug-nonroot
+baseImageOverrides:
+  knative.dev/client/cmd/kn: docker.io/library/alpine:latest

lib/test/service.go

@@ -21,14 +21,15 @@ import (
 	"gotest.tools/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	pkgtest "knative.dev/pkg/test"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
 	"knative.dev/client/pkg/util"
 )
 
 // ServiceCreate verifies given service creation in sync mode and also verifies output
 func ServiceCreate(r *KnRunResultCollector, serviceName string) {
-	out := r.KnTest().Kn().Run("service", "create", serviceName, "--image", GetKnTestImage())
+	out := r.KnTest().Kn().Run("service", "create", serviceName, "--image", pkgtest.ImagePath("helloworld"))
 	r.AssertNoError(out)
 	assert.Check(r.T(), util.ContainsAllIgnoreCase(out.Stdout, "service", serviceName, "creating", "namespace", r.KnTest().Kn().Namespace(), "ready"))
 }
@@ -51,7 +52,7 @@ func ServiceList(r *KnRunResultCollector, serviceName string) {
 func ServiceDescribe(r *KnRunResultCollector, serviceName string) {
 	out := r.KnTest().Kn().Run("service", "describe", serviceName)
 	r.AssertNoError(out)
-	assert.Assert(r.T(), util.ContainsAll(out.Stdout, serviceName, r.KnTest().Kn().Namespace(), GetKnTestImage()))
+	assert.Assert(r.T(), util.ContainsAll(out.Stdout, serviceName, r.KnTest().Kn().Namespace(), pkgtest.ImagePath("helloworld")))
 	assert.Assert(r.T(), util.ContainsAll(out.Stdout, "Conditions", "ConfigurationsReady", "Ready", "RoutesReady"))
 	assert.Assert(r.T(), util.ContainsAll(out.Stdout, "Name", "Namespace", "URL", "Age", "Revisions"))
 }

test/README.md

@@ -66,3 +66,30 @@ mode, use
 ```bash
 test/local-e2e-tests.sh -short
 ```
+
+## Test images
+
+### Building the test images
+
+The [`upload-test-images.sh`](./upload-test-images.sh) script can be used to
+build and push the test images used by the e2e tests. The script
+expects your environment to be setup as described in
+[DEVELOPMENT.md](https://github.com/knative/serving/blob/master/DEVELOPMENT.md#install-requirements).
+
+To run the script for all end to end test images:
+
+```bash
+./test/upload-test-images.sh
+```
+
+A docker tag may be passed as an optional parameter. This can be useful on
+Minikube in tandem with the `--tag` [flag](#using-a-docker-tag):
+
+```bash
+eval $(minikube docker-env)
+./test/upload-test-images.sh any-old-tag
+```
+
+### Adding new test images
+
+New test images should be placed in `./test/test_images`.

test/common.sh

@@ -51,3 +51,9 @@ function knative_setup() {
     wait_until_pods_running knative-eventing || return 1
   fi
 }
+
+# Create test resources and images
+function test_setup() {
+  echo ">> Uploading test images..."
+  ${REPO_ROOT_DIR}/test/upload-test-images.sh || return 1  
+}

test/e2e-tests.sh

@@ -62,10 +62,7 @@ smoke_test() {
   ns="kne2esmoketests"
 
   # Test image
-  img=${KN_TEST_IMAGE}
-  if [[ -z "${KN_TEST_IMAGE}" ]]; then
-    img="gcr.io/knative-samples/helloworld-go"
-  fi
+  img=${KO_DOCKER_REPO}/helloworld
 
   set -x
 

test/test_images/helloworld/release.yaml

@@ -0,0 +1,15 @@
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+image: ko://knative.dev/client/test/test_images/helloworld

test/upload-test-images.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#
+# Copyright 2020 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+
+function upload_test_images() {
+  echo ">> Publishing test images"
+  # Script needs to be executed from the root directory
+  # to pickup .ko.yaml
+  cd "$( dirname "$0")/.."
+  local image_dir="test/test_images"
+  local docker_tag=$1
+  local tag_option=""
+  if [ -n "${docker_tag}" ]; then
+    tag_option="--tags $docker_tag,latest"
+  fi
+
+  # ko resolve is being used for the side-effect of publishing images,
+  # so the resulting yaml produced is ignored.
+  # We limit the number of concurrent builds (jobs) to avoid OOMs.
+  ko resolve --jobs=4 ${tag_option} -RBf "${image_dir}" > /dev/null
+}
+
+: ${KO_DOCKER_REPO:?"You must set 'KO_DOCKER_REPO'"}
+
+upload_test_images $@