Updates in the e2e flow to build the multidistro/multiarch images

Author: mauriciopoppe

hack/e2e.sh

@@ -141,6 +141,10 @@ CLUSTER=${CLUSTER:-e2e}
 GKE_ENVIRONMENT=${GKE_ENVIRONMENT:-prod}
 KUBERNETES_SRC=${KUBERNETES_SRC:-} # If set, skip extracting kubernetes, use it as kubernetes src.
 KIND_NODE_IMAGE=${KIND_NODE_IMAGE:-} # Prebuilt kind node image to use, e.g. kindest/node:v1.15.0.
+# set from kubernetes/test-infra
+GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_APPLICATION_CREDENTIALS:-}
+JENKINS_GCE_SSH_PRIVATE_KEY_FILE=${JENKINS_GCE_SSH_PRIVATE_KEY_FILE:-}
+JENKINS_GCE_SSH_PUBLIC_KEY_FILE=${JENKINS_GCE_SSH_PUBLIC_KEY_FILE:-}
 
 if [ -z "$PROVIDER" ]; then
     echo "PROVIDER not specified, detecting provider automatically" >&2
@@ -161,6 +165,9 @@ echo "DEPLOYMENT: $DEPLOYMENT" >&2
 echo "CLUSTER: $CLUSTER" >&2
 echo "GKE_ENVIRONMENT: $GKE_ENVIRONMENT" >&2
 echo "KUBERNETES_SRC: $KUBERNETES_SRC" >&2
+echo "GOOGLE_APPLICATION_CREDENTIALS: $GOOGLE_APPLICATION_CREDENTIALS" >&2
+echo "JENKINS_GCE_SSH_PRIVATE_KEY_FILE: $JENKINS_GCE_SSH_PRIVATE_KEY_FILE" >&2
+echo "JENKINS_GCE_SSH_PUBLIC_KEY_FILE: $JENKINS_GCE_SSH_PUBLIC_KEY_FILE" >&2
 
 kubetest_args=(
     --provider "$PROVIDER"
@@ -213,12 +220,12 @@ if [ "$PROVIDER" == "gce" -o "$PROVIDER" == "gke" ]; then
     if [ ! -d ~/.ssh ]; then
         mkdir ~/.ssh
     fi
-    if [ -e ~/.ssh/google_compute_engine -o -n "$JENKINS_GCE_SSH_PRIVATE_KEY_FILE" ]; then
+    if [ -n "$JENKINS_GCE_SSH_PRIVATE_KEY_FILE" ]; then
         echo "Copying $JENKINS_GCE_SSH_PRIVATE_KEY_FILE to ~/.ssh/google_compute_engine" >&2
         cp $JENKINS_GCE_SSH_PRIVATE_KEY_FILE ~/.ssh/google_compute_engine
         chmod 0600 ~/.ssh/google_compute_engine
     fi
-    if [ -e ~/.ssh/google_compute_engine.pub -o -n "$JENKINS_GCE_SSH_PUBLIC_KEY_FILE" ]; then
+    if [ -n "$JENKINS_GCE_SSH_PUBLIC_KEY_FILE" ]; then
         echo "Copying $JENKINS_GCE_SSH_PUBLIC_KEY_FILE to ~/.ssh/google_compute_engine.pub" >&2
         cp $JENKINS_GCE_SSH_PUBLIC_KEY_FILE ~/.ssh/google_compute_engine.pub
         chmod 0600 ~/.ssh/google_compute_engine.pub
@@ -286,9 +293,9 @@ if [ "${1:-}" == "--" ]; then
 fi
 
 if [ "$PROVIDER" == "gke" ]; then
+        # --up
+        # --down
     kubetest2_args+=(
-        --up
-        --down
         --test exec
         -v 1
         --cluster-name "$CLUSTER"
@@ -317,8 +324,6 @@ fi
 # legacy path
 go run $ROOT/hack/e2e.go -- "${kubetest_args[@]}" \
     --deployment "$DEPLOYMENT" \
-    --up \
-    --down \
     --test-cmd bash \
     --test-cmd-args="$ROOT/hack/run-e2e.sh" \
     "$@"

hack/run-e2e.sh

@@ -19,6 +19,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -x
 
 # Note that kubetest run this script under kubernetes root directory.
 KUBE_ROOT=$(pwd)
@@ -80,10 +81,21 @@ fi
 
 # build image if not specified
 if [ -z "$PROVISIONER_E2E_IMAGE" ]; then
-    make
-    PROVISIONER_E2E_IMAGE=" k8s.gcr.io/sig-storage/local-volume-provisioner:latest_linux_amd64"
-else
-    docker pull $PROVISIONER_E2E_IMAGE
+    # build and push ${version}_linux_amd64 and ${version}_windows_ltsc2019
+    VERSION=${VERSION:-$(git describe --tags --abbrev=8 --always)}
+    REGISTRY=${REGISTRY:-k8s.gcr.io/sig-storage}
+    IMAGE=local-volume-provisioner
+
+    REGISTRY=${REGISTRY} \
+        VERSION=$VERSION \
+        CONFIRM=false \
+        ALLOW_UNSTABLE=true \
+        ALLOW_DIRTY=true \
+        LINUX_ARCH="amd64" \
+        WINDOWS_DISTROS="ltsc2019" \
+        ./hack/release.sh
+
+    PROVISIONER_E2E_IMAGE="$REGISTRY/${IMAGE}:${VERSION}"
 fi
 
 # Why we use KUBERNETES_CONFORMANCE_PROVIDER here, see
@@ -97,13 +109,7 @@ if [ "$KUBERNETES_PROVIDER" == "gce" -o "$KUBERNETES_CONFORMANCE_PROVIDER" == "g
             exit 1
         fi
     fi
-    VERSION=$(git describe --tags --abbrev=8 --always)
-    PROVISIONER_IMAGE_NAME=gcr.io/$PROJECT/local-volume-provisioner:$VERSION
-    echo "Tag and push image $PROVISIONER_IMAGE_NAME"
-    docker tag $PROVISIONER_E2E_IMAGE $PROVISIONER_IMAGE_NAME
-    unset DOCKER_CONFIG # We don't need this and it may be read-only and fail the command to fail
-    gcloud auth configure-docker
-    docker push $PROVISIONER_IMAGE_NAME
+    PROVISIONER_IMAGE_NAME=$PROVISIONER_E2E_IMAGE
     PROVISIONER_IMAGE_PULL_POLICY=Always
 elif [ "$KUBERNETES_PROVIDER" == "local" ]; then
     KUBECONFIG=/var/run/kubernetes/admin.kubeconfig