Add e2e test. (#353)

Signed-off-by: Lantao Liu <lantaol@google.com>

test/e2e_node/build.sh

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# TODO(random-liu): Remove this after test-infra side is updated.
 # This script is used to build and upload cri-containerd in gcr.io/k8s-testimages/kubekins-e2e.
 
 set -o xtrace
@@ -49,6 +50,10 @@ if [ ! -z "${PULL_REFS:-""}" ]; then
   DEPLOY_DIR=$(echo "${PULL_REFS}" | sha1sum | awk '{print $1}')
 fi
 
+# Make sure output directory is clean.
+make clean
+# Build and push e2e tarball.
+DEPLOY_DIR=${DEPLOY_DIR:-""} make push
 # Build and push node e2e tarball.
 PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \
   make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true

test/e2e_node/configure.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Kubernetes 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
-#
-#     http://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 xtrace
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# CRI_CONTAINERD_HOME is the directory for cri-containerd.
-CRI_CONTAINERD_HOME="/home/cri-containerd"
-cd "${CRI_CONTAINERD_HOME}"
-
-# ATTRIBUTES is the url of gce metadata attributes.
-ATTRIBUTES="http://metadata.google.internal/computeMetadata/v1/instance/attributes"
-
-# DEPLOY_PATH is the gcs path where cri-containerd tarball is stored.
-DEPLOY_PATH=${DEPLOY_PATH:-"cri-containerd-staging"}
-# PULL_REFS_METADATA is the metadata key of PULL_REFS from prow.
-PULL_REFS_METADATA="PULL_REFS"
-if curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" "${ATTRIBUTES}/" | \
-  grep -q "${PULL_REFS_METADATA}"; then
-  PULL_REFS=$(curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" \
-    "${ATTRIBUTES}/${PULL_REFS_METADATA}")
-  DEPLOY_DIR=$(echo "${PULL_REFS}" | sha1sum | awk '{print $1}')
-  DEPLOY_PATH="${DEPLOY_PATH}/${DEPLOY_DIR}"
-fi
-
-# VERSION is the latest cri-containerd version got from cri-containerd gcs
-# bucket.
-VERSION=$(curl -f --ipv4 --retry 6 --retry-delay 3 --silent --show-error \
-  https://storage.googleapis.com/${DEPLOY_PATH}/latest)
-# TARBALL_GCS_PATH is the path to download cri-containerd tarball for node e2e.
-TARBALL_GCS_PATH="https://storage.googleapis.com/${DEPLOY_PATH}/cri-containerd-cni-${VERSION}.tar.gz"
-# TARBALL is the name of the tarball after being downloaded.
-TARBALL="cri-containerd.tar.gz"
-
-# Download and untar the release tar ball.
-curl -f --ipv4 -Lo "${TARBALL}" --connect-timeout 20 --max-time 300 --retry 6 --retry-delay 10 "${TARBALL_GCS_PATH}"
-tar xvf "${TARBALL}"
-
-# EXTRA_INIT_SCRIPT is the name of the extra init script after being downloaded.
-EXTRA_INIT_SCRIPT="extra-init.sh"
-# EXTRA_INIT_SCRIPTINIT_SCRIPT_METADATA is the metadata key of init script.
-EXTRA_INIT_SCRIPT_METADATA="extra-init-sh"
-
-# Check whether extra-init-sh is set.
-if ! curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" "${ATTRIBUTES}/" | \
-  grep -q "${EXTRA_INIT_SCRIPT_METADATA}"; then
-  exit 0
-fi
-
-# Run extra-init.sh if extra-init-sh is set.
-curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o "${EXTRA_INIT_SCRIPT}" \
-  "${ATTRIBUTES}/${EXTRA_INIT_SCRIPT_METADATA}"
-chmod 544 "${EXTRA_INIT_SCRIPT}"
-./${EXTRA_INIT_SCRIPT}

test/e2e_node/image-config.yaml

@@ -2,8 +2,8 @@ images:
   ubuntu:
     image: ubuntu-gke-1604-xenial-v20170420-1
     project: ubuntu-os-gke-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,configure-sh<test/e2e_node/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
   cos-stable:
     image_regex: cos-stable-60-9592-84-0
     project: cos-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,configure-sh<test/e2e_node/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"

test/e2e_node/init.yaml

@@ -16,7 +16,7 @@ write_files:
       ExecStartPre=/bin/mkdir -p /home/cri-containerd
       ExecStartPre=/bin/mount --bind /home/cri-containerd /home/cri-containerd
       ExecStartPre=/bin/mount -o remount,exec /home/cri-containerd
-      ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/cri-containerd/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-sh
+      ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/cri-containerd/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/cri-containerd-configure-sh
       ExecStartPre=/bin/chmod 544 /home/cri-containerd/configure.sh
       ExecStart=/home/cri-containerd/configure.sh