From 69c16929e3195d3124562cd5b97a56178af05109 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Thu, 2 Nov 2017 22:50:27 +0000
Subject: [PATCH] Fix our node e2e test.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 test/build.sh          |  2 +-
 test/e2e_node/build.sh | 59 ------------------------------------------
 2 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100755 test/e2e_node/build.sh

diff --git a/test/build.sh b/test/build.sh
index fff9bb2e0..a5a73c536 100755
--- a/test/build.sh
+++ b/test/build.sh
@@ -21,7 +21,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/../..
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 cd "${ROOT}"
 
 # PROJECT is the gce project to upload tarball.
diff --git a/test/e2e_node/build.sh b/test/e2e_node/build.sh
deleted file mode 100755
index 23a9b77c8..000000000
--- a/test/e2e_node/build.sh
+++ /dev/null
@@ -1,59 +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.
-
-# 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
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/../..
-cd "${ROOT}"
-
-# PROJECT is the gce project to upload tarball.
-PROJECT=${PROJECT:-"k8s-cri-containerd"}
-
-# GOOGLE_APPLICATION_CREDENTIALS is the path of service account file.
-if [ -z ${GOOGLE_APPLICATION_CREDENTIALS} ]; then
-  echo "GOOGLE_APPLICATION_CREDENTIALS is not set"
-  exit 1
-fi
-
-# Activate gcloud service account.
-gcloud auth activate-service-account --key-file "${GOOGLE_APPLICATION_CREDENTIALS}" --project="${PROJECT}"
-
-# Install dependent libraries.
-sh -c "echo 'deb http://ftp.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list"
-apt-get update
-apt-get install -y btrfs-tools
-apt-get install -y libseccomp2/jessie-backports
-apt-get install -y libseccomp-dev/jessie-backports
-apt-get install -y libapparmor-dev
-
-# PULL_REFS is from prow.
-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