Merge pull request #746 from mattcary/versionlog

Remove duplication of k8sDir which caused --test_version to not be effective

Author: k8s-ci-robot

test/k8s-integration/cluster.go

@@ -207,7 +207,7 @@ func clusterUpGKE(gceZone, gceRegion string, numNodes int, imageType string, use
 
 func downloadKubernetesSource(pkgDir, k8sIoDir, kubeVersion string) error {
 	k8sDir := filepath.Join(k8sIoDir, "kubernetes")
-	klog.V(4).Infof("Downloading Kubernetes source")
+	klog.Infof("Downloading Kubernetes source for %s", kubeVersion)
 
 	if err := os.MkdirAll(k8sIoDir, 0777); err != nil {
 		return err
@@ -222,6 +222,7 @@ func downloadKubernetesSource(pkgDir, k8sIoDir, kubeVersion string) error {
 		// use a shallow clone, because in order to find the revision git searches through the tags,
 		// and tags are not fetched in a shallow clone. Not using a shallow clone adds about 700M to the
 		// ~5G archive directory, after make quick-release, so this is not disastrous.
+		klog.Info("cloning k8s master")
 		out, err := exec.Command("git", "clone", "https://github.com/kubernetes/kubernetes", k8sDir).CombinedOutput()
 		if err != nil {
 			return fmt.Errorf("failed to clone kubernetes master: %s, err: %v", out, err)
@@ -230,6 +231,7 @@ func downloadKubernetesSource(pkgDir, k8sIoDir, kubeVersion string) error {
 		// Download from the release archives rather than cloning the repo.
 		vKubeVersion := "v" + kubeVersion
 		kubeTarDir := filepath.Join(k8sIoDir, fmt.Sprintf("kubernetes-%s.tar.gz", kubeVersion))
+		klog.Infof("Pulling archive for %s", vKubeVersion)
 		out, err := exec.Command("curl", "-L", fmt.Sprintf("https://github.com/kubernetes/kubernetes/archive/%s.tar.gz", vKubeVersion), "-o", kubeTarDir).CombinedOutput()
 		if err != nil {
 			return fmt.Errorf("failed to curl kubernetes version %s: %s, err: %v", kubeVersion, out, err)
@@ -245,7 +247,7 @@ func downloadKubernetesSource(pkgDir, k8sIoDir, kubeVersion string) error {
 			return err
 		}
 
-		klog.V(4).Infof("Successfully downloaded Kubernetes v%s to %s", kubeVersion, k8sDir)
+		klog.Infof("Successfully downloaded Kubernetes v%s to %s", kubeVersion, k8sDir)
 	}
 	return nil
 }

test/k8s-integration/main.go

@@ -263,26 +263,23 @@ func handle() error {
 	}
 
 	// Create temporary directories for kubernetes builds
-	k8sParentDir := generateUniqueTmpDir()
-	k8sDir := filepath.Join(k8sParentDir, "kubernetes")
 	testParams.testParentDir = generateUniqueTmpDir()
 	testParams.testDir = filepath.Join(testParams.testParentDir, "kubernetes")
-	defer removeDir(k8sParentDir)
 	defer removeDir(testParams.testParentDir)
 
 	// If kube version is set, then download and build Kubernetes for cluster creation
 	// Otherwise, either GKE or a prebuild local K8s dir is being used
 	if len(*kubeVersion) != 0 {
-		err := downloadKubernetesSource(testParams.pkgDir, k8sParentDir, *kubeVersion)
+		err := downloadKubernetesSource(testParams.pkgDir, testParams.testParentDir, *kubeVersion)
 		if err != nil {
 			return fmt.Errorf("failed to download Kubernetes source: %v", err)
 		}
-		err = buildKubernetes(k8sDir, "quick-release")
+		err = buildKubernetes(testParams.testDir, "quick-release")
 		if err != nil {
 			return fmt.Errorf("failed to build Kubernetes: %v", err)
 		}
 	} else {
-		k8sDir = *localK8sDir
+		testParams.testDir = *localK8sDir
 	}
 
 	// If test version is set, then download and build Kubernetes to run K8s tests
@@ -305,8 +302,6 @@ func handle() error {
 		if err != nil {
 			return fmt.Errorf("failed to build kubectl: %v", err)
 		}
-	} else {
-		testParams.testDir = k8sDir
 	}
 
 	if *deploymentStrat == "gke" {
@@ -322,7 +317,7 @@ func handle() error {
 		var err error = nil
 		switch *deploymentStrat {
 		case "gce":
-			err = clusterUpGCE(k8sDir, *gceZone, *numNodes, testParams.imageType)
+			err = clusterUpGCE(testParams.testDir, *gceZone, *numNodes, testParams.imageType)
 		case "gke":
 			err = clusterUpGKE(*gceZone, *gceRegion, *numNodes, testParams.imageType, testParams.useGKEManagedDriver)
 		default:
@@ -338,7 +333,7 @@ func handle() error {
 		defer func() {
 			switch testParams.deploymentStrategy {
 			case "gce":
-				err := clusterDownGCE(k8sDir)
+				err := clusterDownGCE(testParams.testDir)
 				if err != nil {
 					klog.Errorf("failed to cluster down: %v", err)
 				}

test/run-k8s-integration-ci.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Optional environment variables
 # GCE_PD_OVERLAY_NAME: which Kustomize overlay to deploy with