tag service catalog image

Author: bparees

install/templateservicebroker/apiserver-template.yaml

@@ -47,7 +47,7 @@ objects:
           - "--audit-log-path=-"
           - "--tls-cert-file=/var/serving-cert/tls.crt"
           - "--tls-private-key-file=/var/serving-cert/tls.key"
-          - "--loglevel=${LOGLEVEL}"
+          - "-v=${LOGLEVEL}"
           - "--config=/var/apiserver-config/apiserver-config.yaml"
           ports:
           - containerPort: 8443

pkg/oc/bootstrap/bindata.go

@@ -1138,13 +1138,14 @@ func (c *ClientStartConfig) InstallTemplateServiceBroker(out io.Writer) error {
 	if !version.GT(openshiftVersion37) {
 		imageTemplate = fmt.Sprintf("%s:%s", c.Image, c.ImageVersion)
 	}
-	// TODO we want to use this eventually, but until we have our own image for TSB, we have to hardcode this origin
-	//return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.imageFormat())
-	err = c.OpenShiftHelper().InstallTemplateServiceBroker(f, imageTemplate, c.ServerLogLevel)
-	if err != nil {
-		glog.Errorf("error installing tsb: %v", err)
-	}
-	return nil
+	return c.OpenShiftHelper().InstallTemplateServiceBroker(f, imageTemplate, c.ServerLogLevel)
+	/*
+		err = c.OpenShiftHelper().InstallTemplateServiceBroker(f, imageTemplate, c.ServerLogLevel)
+		if err != nil {
+			glog.Errorf("error installing tsb: %v", err)
+		}
+		return nil
+	*/
 }
 
 // RegisterTemplateServiceBroker will register the tsb with the service catalog
@@ -1153,11 +1154,14 @@ func (c *ClientStartConfig) RegisterTemplateServiceBroker(out io.Writer) error {
 	if err != nil {
 		return err
 	}
-	err = c.OpenShiftHelper().RegisterTemplateServiceBroker(f, c.LocalConfigDir)
-	if err != nil {
-		glog.Errorf("error registering tsb: %v", err)
-	}
-	return nil
+	return c.OpenShiftHelper().RegisterTemplateServiceBroker(f, c.LocalConfigDir)
+	/*
+		err = c.OpenShiftHelper().RegisterTemplateServiceBroker(f, c.LocalConfigDir)
+		if err != nil {
+			glog.Errorf("error registering tsb: %v", err)
+		}
+		return nil
+	*/
 }
 
 // Login logs into the new server and sets up a default user and project

pkg/oc/bootstrap/docker/up.go

@@ -270,17 +270,25 @@ readonly default_tests=(
 # run each test with each of these set of additiona args.  Primarily
 # intended to run the tests against different cluster versions.
 readonly extra_args=(
-# TODO - switch this to 3.7 and turn it on, once 3.7 is available.
-# Fails with 3.6 right now because the SC wasn't supported for 3.6 with a 3.7 client.
-#    "--image=registry.access.redhat.com/openshift3/ose --version=v3.6"
-    "--loglevel=2 --image=docker.io/openshift/origin --version=v3.7.0-rc.0"
+    # Test the code being delivered
     "--loglevel=2 --version=${ORIGIN_COMMIT}"
+    # Test the current published release
     "--loglevel=2"  # can't be empty, so pass something benign
+    # Test the previous origin release
+    "--loglevel=2 --image=docker.io/openshift/origin --version=v3.7.0-rc.0"
+    # Test the previous OCP release
+    # TODO - turn this on once OCP v3.7 is available.
+    #   "--image=registry.access.redhat.com/openshift3/ose --version=v3.7"
 )
 tests=("${1:-"${default_tests[@]}"}")
 
 ORIGIN_COMMIT=${ORIGIN_COMMIT:-latest}
 
+# re-tag the latest service catalog image w/ the origin commit because we didn't
+# build it locally, so we need a tag that aligns with the other images we're going to test here.
+docker pull openshift/origin-service-catalog:latest
+docker tag openshift/origin-service-catalog:latest openshift/origin-service-catalog:${ORIGIN_COMMIT}
+
 echo "Running cluster up tests using tag $ORIGIN_COMMIT"
 
 # Ensure that KUBECONFIG is not set