Merge pull request #143 from msau42/gke-testing

Make boskos resource name configurable

Author: k8s-ci-robot

test/e2e/tests/setup_e2e_test.go

@@ -62,7 +62,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).To(BeNil())
 
 	if *runInProw {
-		*project, *serviceAccount = testutils.SetupProwConfig()
+		*project, *serviceAccount = testutils.SetupProwConfig("gce-project")
 	}
 
 	Expect(*project).ToNot(BeEmpty(), "Project should not be empty")

test/e2e/utils/utils.go

@@ -64,18 +64,18 @@ func GCEClientAndDriverSetup(instance *remote.InstanceInfo) (*remote.TestContext
 	return remote.SetupNewDriverAndClient(instance, config)
 }
 
-func SetupProwConfig() (project, serviceAccount string) {
+func SetupProwConfig(resourceType string) (project, serviceAccount string) {
 	// Try to get a Boskos project
 	glog.V(4).Infof("Running in PROW")
 	glog.V(4).Infof("Fetching a Boskos loaned project")
 
-	p, err := boskos.Acquire("gce-project", "free", "busy")
+	p, err := boskos.Acquire(resourceType, "free", "busy")
 	if err != nil {
 		glog.Fatalf("boskos failed to acquire project: %v", err)
 	}
 
 	if p == nil {
-		glog.Fatal("boskos does not have a free gce-project at the moment")
+		glog.Fatal("boskos does not have a free %s at the moment", resourceType)
 	}
 
 	project = p.GetName()

test/k8s-integration/main.go

@@ -32,16 +32,17 @@ import (
 )
 
 var (
-	teardownCluster   = flag.Bool("teardown-cluster", true, "teardown the cluster after the e2e test")
-	teardownDriver    = flag.Bool("teardown-driver", true, "teardown the driver after the e2e test")
-	bringupCluster    = flag.Bool("bringup-cluster", true, "build kubernetes and bringup a cluster")
-	stagingImage      = flag.String("staging-image", "", "name of image to stage to")
-	kubeVersion       = flag.String("kube-version", "master", "version of Kubernetes to download and use")
-	inProw            = flag.Bool("run-in-prow", false, "is the test running in PROW")
-	saFile            = flag.String("service-account-file", "", "path of service account file")
-	deployOverlayName = flag.String("deploy-overlay-name", "", "which kustomize overlay to deploy the driver with")
-	localK8sDir       = flag.String("local-k8s-dir", "", "local kubernetes/kubernetes directory to run e2e tests from")
-	doDriverBuild     = flag.Bool("do-driver-build", true, "building the driver from source")
+	teardownCluster    = flag.Bool("teardown-cluster", true, "teardown the cluster after the e2e test")
+	teardownDriver     = flag.Bool("teardown-driver", true, "teardown the driver after the e2e test")
+	bringupCluster     = flag.Bool("bringup-cluster", true, "build kubernetes and bringup a cluster")
+	stagingImage       = flag.String("staging-image", "", "name of image to stage to")
+	kubeVersion        = flag.String("kube-version", "master", "version of Kubernetes to download and use")
+	inProw             = flag.Bool("run-in-prow", false, "is the test running in PROW")
+	saFile             = flag.String("service-account-file", "", "path of service account file")
+	deployOverlayName  = flag.String("deploy-overlay-name", "", "which kustomize overlay to deploy the driver with")
+	localK8sDir        = flag.String("local-k8s-dir", "", "local kubernetes/kubernetes directory to run e2e tests from")
+	doDriverBuild      = flag.Bool("do-driver-build", true, "building the driver from source")
+	boskosResourceType = flag.String("boskos-resource-type", "gce-project", "name of the boskos resource type to reserve")
 )
 
 func init() {
@@ -83,7 +84,7 @@ func handle() error {
 	k8sDir := filepath.Join(k8sIoDir, "kubernetes")
 
 	if *inProw {
-		project, _ := testutils.SetupProwConfig()
+		project, _ := testutils.SetupProwConfig(*boskosResourceType)
 
 		oldProject, err := exec.Command("gcloud", "config", "get-value", "project").CombinedOutput()
 		if err != nil {

test/run-k8s-integration.sh

@@ -4,13 +4,15 @@
 # GCE_PD_OVERLAY_NAME: which Kustomize overlay to deploy with
 # GCE_PD_DO_DRIVER_BUILD: if set, don't build the driver from source and just
 #   use the driver version from the overlay
+# GCE_PD_BOSKOS_RESOURCE_TYPE: name of the boskos resource type to reserve
 
 set -o nounset
 set -o errexit
 
 readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 readonly overlay_name="${GCE_PD_OVERLAY_NAME:-prow-head-template}"
+readonly boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
 readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 
 make -C ${PKGDIR} test-k8s-integration
-${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=true --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} --do-driver-build=${do_driver_build}
+${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=true --deploy-overlay-name=${overlay_name} --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} --do-driver-build=${do_driver_build} --boskos-resource-type=${boskos_resource_type}