Add test for uploading system CNB

  * includes pushing an app with it

Author: sethboyles

README.md

@@ -111,7 +111,7 @@ include_app_syslog_tcp
 * `include_app_syslog_tcp`: Flag to include the app syslog drain over TCP test group.
 * `include_apps`: Flag to include the apps test group.
 * `readiness_health_checks_enabled`: Defaults to `true`. Set to false if you are using an environment without readiness health checks.
-* `include_cnb`: Flag to include tests related to building apps using Cloud Native Buildpacks. Diego must be deployed and the CC API diego_cnb feature flag must be enabled for these tests to pass. The CF CLI version must be at least v8.9.0.
+* `include_cnb`: Flag to include tests related to building apps using Cloud Native Buildpacks. Diego must be deployed and the CC API diego_cnb feature flag must be enabled for these tests to pass. The CF CLI version must be at least v8.14.0.
 * `include_container_networking`: Flag to include tests related to container networking.
 * `credhub_mode`: Valid values are `assisted` or `non-assisted`. [See below](#credhub-modes).
 * `credhub_location`: Location of CredHub instance; default is `https://credhub.service.cf.internal:8844`

assets/cnb-node-buildpack/nodejs-7.6.2.cnb

@@ -9,6 +9,7 @@ import (
 	"github.com/cloudfoundry/cf-acceptance-tests/helpers/random_name"
 	"github.com/cloudfoundry/cf-test-helpers/v2/cf"
 	"github.com/cloudfoundry/cf-test-helpers/v2/helpers"
+	"github.com/cloudfoundry/cf-test-helpers/v2/workflowhelpers"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -43,17 +44,41 @@ var _ = CNBDescribe("CloudNativeBuildpacks lifecycle", func() {
 		})
 	})
 
-	Describe("pushing Node.js application with CNB lifecycle and no buildpacks", func() {
-		It("fails", func() {
-			Skip("System buildpacks are supported in latest CAPI version")
-			push := cf.Cf("push",
-				appName,
-				"-p", assets.NewAssets().CNBNode,
-				"-f", filepath.Join(assets.NewAssets().CNBNode, "manifest.yml"),
-			).Wait(Config.CfPushTimeoutDuration())
+	Describe("creating system CNB buildpacks", func() {
+		var buildpackName string
+
+		BeforeEach(func() {
+			buildpackName = random_name.CATSRandomName("CNB-BUILDPACK")
+		})
+
+		AfterEach(func() {
+			workflowhelpers.AsUser(TestSetup.AdminUserContext(), Config.DefaultTimeoutDuration(), func() {
+				Expect(cf.Cf("delete-buildpack", buildpackName, "-f").Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
+			})
+		})
+
+		Describe("uploading a .cnb extension cnb", func() {
+			It("makes the app reachable by its bound route", func() {
+				workflowhelpers.AsUser(TestSetup.AdminUserContext(), Config.DefaultTimeoutDuration(), func() {
+					Expect(cf.Cf("create-buildpack",
+						buildpackName,
+						assets.NewAssets().CNBNodeBuildpack,
+						"1",
+						"--lifecycle", "cnb",
+					).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
+				})
+
+				Expect(cf.Cf("push",
+					appName,
+					"-p", assets.NewAssets().CNBNode,
+					"-b", buildpackName,
+					"-f", filepath.Join(assets.NewAssets().CNBNode, "manifest.yml"),
+				).Wait(Config.CfPushTimeoutDuration())).To(Exit(0))
 
-			Expect(push).To(Exit(1))
-			Expect(combineOutput(push.Out, push.Err)).To(Say("Buildpack\\(s\\) must be specified when using Cloud Native Buildpacks"))
+				Eventually(func() string {
+					return helpers.CurlAppRoot(Config, appName)
+				}).Should(ContainSubstring("Hello from a node app!"))
+			})
 		})
 	})
 })

cnb/cnb_lifecycle.go

@@ -4,6 +4,7 @@ type Assets struct {
 	AspClassic                 string
 	Catnip                     string
 	CatnipSrc                  string
+	CNBNodeBuildpack           string
 	CredHubEnabledApp          string
 	CredHubServiceBroker       string
 	Dora                       string
@@ -51,6 +52,7 @@ func NewAssets() Assets {
 		AspClassic:           "assets/asp-classic",
 		Catnip:               "assets/catnip/bin",
 		CatnipSrc:            "assets/catnip",
+		CNBNodeBuildpack:     "assets/cnb-node-buildpack/nodejs-7.6.2.cnb",
 		CredHubEnabledApp:    "assets/credhub-enabled-app/credhub-enabled-app.jar",
 		CredHubServiceBroker: "assets/credhub-service-broker",
 		Dora:                 "assets/dora",