Make windows-specific acceptance_test case

- Bump imgutil to feature/23-windows-linux-images branch - Make separate stacks for linux/windows Signed-off-by: Micah Young <ymicah@vmware.com>
mdelillo · May 5, 2020 · c6fdc35 · c6fdc35
1 parent 7385b3a
commit c6fdc35
Show file tree

Hide file tree

Showing 21 changed files with 292 additions and 91 deletions.
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -553,6 +553,20 @@ func testAcceptance(
 			runImageMirror = value
 		})
 
+		when("creating a windows builder", func() {
+			windowsDaemon := true
+			it("succeeds", func() {
+				img := createBuilder(t,
+					runImageMirror,
+					configDir,
+					packCreateBuilderPath,
+					lifecyclePath,
+					lifecycleDescriptor,
+					windowsDaemon)
+				h.DockerRmi(dockerCli, img)
+			})
+		})
+
 		when("builder is created", func() {
 			var (
 				builderName string
@@ -566,7 +580,7 @@ func testAcceptance(
 
 				key := taskKey("create-builder", runImageMirror, configDir, packCreateBuilderPath, lifecyclePath)
 				value, err := suiteManager.RunTaskOnceString(key, func() (string, error) {
-					return createBuilder(t, runImageMirror, configDir, packCreateBuilderPath, lifecyclePath, lifecycleDescriptor), nil
+					return createBuilder(t, runImageMirror, configDir, packCreateBuilderPath, lifecyclePath, lifecycleDescriptor, false), nil
 				})
 				h.AssertNil(t, err)
 				suiteManager.RegisterCleanUp("clean-"+key, func() error {
@@ -1645,7 +1659,7 @@ func buildPack(t *testing.T, compileVersion string) string {
 	return packPath
 }
 
-func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecyclePath string, lifecycleDescriptor builder.LifecycleDescriptor) string {
+func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecyclePath string, lifecycleDescriptor builder.LifecycleDescriptor, windowsDaemon bool) string {
 	t.Log("creating builder image...")
 
 	// CREATE TEMP WORKING DIR
@@ -1672,15 +1686,19 @@ func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecycleP
 		h.AssertNil(t, err)
 	}
 
-	// CREATE PACKAGE
-	packageImageName := packageBuildpackAsImage(t,
-		packPath,
-		filepath.Join(configDir, "package.toml"),
-		lifecycleDescriptor,
-		[]string{"simple-layers-buildpack"},
-	)
+	var packageImageName string
+	var packageId string
+	if !windowsDaemon {
+		// CREATE PACKAGE
+		packageImageName = packageBuildpackAsImage(t,
+			packPath,
+			filepath.Join(configDir, "package.toml"),
+			lifecycleDescriptor,
+			[]string{"simple-layers-buildpack"},
+		)
 
-	packageId := "simple/layers"
+		packageId = "simple/layers"
+	}
 
 	// ADD lifecycle
 	var lifecycleURI string
@@ -1696,10 +1714,10 @@ func createBuilder(t *testing.T, runImageMirror, configDir, packPath, lifecycleP
 	// RENDER builder.toml
 	cfgData := fillTemplate(t, filepath.Join(configDir, "builder.toml"), map[string]interface{}{
 		"package_image_name": packageImageName,
-		"package_id": packageId,
-		"run_image_mirror": runImageMirror,
-		"lifecycle_uri": lifecycleURI,
-		"lifecycle_version": lifecycleVersion,
+		"package_id":         packageId,
+		"run_image_mirror":   runImageMirror,
+		"lifecycle_uri":      lifecycleURI,
+		"lifecycle_version":  lifecycleVersion,
 	})
 
 	err = ioutil.WriteFile(filepath.Join(tmpDir, "builder.toml"), []byte(cfgData), os.ModePerm)
@@ -1788,10 +1806,16 @@ func createStack(t *testing.T, dockerCli client.CommonAPIClient, runImageMirror
 	t.Helper()
 	t.Log("creating stack images...")
 
-	if err := createStackImage(dockerCli, runImage, filepath.Join("testdata", "mock_stack", "run")); err != nil {
+	daemonInfo, err := dockerCli.Info(context.TODO())
+	h.AssertNil(t, err)
+
+	os := daemonInfo.OSType
+	stackBaseDir := filepath.Join("testdata", "mock_stack", os)
+
+	if err := createStackImage(dockerCli, runImage, filepath.Join(stackBaseDir, "run")); err != nil {
 		return err
 	}
-	if err := createStackImage(dockerCli, buildImage, filepath.Join("testdata", "mock_stack", "build")); err != nil {
+	if err := createStackImage(dockerCli, buildImage, filepath.Join(stackBaseDir, "build")); err != nil {
 		return err
 	}
 

diff --git a/acceptance/testdata/mock_stack/create-stack.sh b/acceptance/testdata/mock_stack/create-stack.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 dir="$(cd $(dirname $0) && pwd)"
+os=$(docker info --format '{{json .}}' | jq -r .OSType)
 
-docker build --tag pack-test/build "$dir"/build
-docker build --tag pack-test/run "$dir"/run
+docker build --tag pack-test/build "$dir"/$os/build
+docker build --tag pack-test/run "$dir"/$os/run
diff --git a/...ance/testdata/mock_stack/build/Dockerfile → ...estdata/mock_stack/linux/build/Dockerfile b/...ance/testdata/mock_stack/build/Dockerfile → ...estdata/mock_stack/linux/build/Dockerfile
diff --git a/...ptance/testdata/mock_stack/run/Dockerfile → .../testdata/mock_stack/linux/run/Dockerfile b/...ptance/testdata/mock_stack/run/Dockerfile → .../testdata/mock_stack/linux/run/Dockerfile
diff --git a/acceptance/testdata/mock_stack/windows/build/Dockerfile b/acceptance/testdata/mock_stack/windows/build/Dockerfile
@@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+# placeholder values until correct values are deteremined
+ENV CNB_USER_ID=0
+ENV CNB_GROUP_ID=0
+
+USER ContainerAdministrator
+
+RUN net users /ADD pack /passwordreq:no /expires:never
+
+LABEL io.buildpacks.stack.id=pack.test.stack
+LABEL io.buildpacks.stack.mixins="[\"mixinA\", \"build:mixinTwo\", \"netcat\", \"mixin3\"]"
+
+USER pack
diff --git a/acceptance/testdata/mock_stack/windows/run/Dockerfile b/acceptance/testdata/mock_stack/windows/run/Dockerfile
@@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+# placeholder values until correct values are deteremined
+ENV CNB_USER_ID=0
+ENV CNB_GROUP_ID=0
+
+USER ContainerAdministrator
+
+RUN net users /ADD pack /passwordreq:no /expires:never
+
+LABEL io.buildpacks.stack.id=pack.test.stack
+LABEL io.buildpacks.stack.mixins="[\"mixinA\", \"netcat\", \"mixin3\"]"
+
+USER pack
diff --git a/acceptance/testdata/pack_fixtures/builder.toml b/acceptance/testdata/pack_fixtures/builder.toml
@@ -40,4 +40,4 @@
 {{- end}}
 {{- if .lifecycle_version}}
   version = "{{.lifecycle_version}}"
-{{- end}}
+{{- end}}
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/Microsoft/hcsshim v0.8.7 // indirect
 	github.com/apex/log v1.1.2
 	github.com/buildpacks/imgutil v0.0.0-20200313170640-a02052f47d62
-	github.com/buildpacks/lifecycle v0.7.1
+	github.com/buildpacks/lifecycle v0.7.2
 	github.com/containerd/containerd v1.3.3 // indirect
 	github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect
 	github.com/dgodd/dockerdial v1.0.1
@@ -48,3 +48,5 @@ require (
 )
 
 go 1.13
+
+replace github.com/buildpacks/imgutil => ../imgutil
diff --git a/go.sum b/go.sum
@@ -64,10 +64,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/buildpacks/imgutil v0.0.0-20200313170640-a02052f47d62 h1:jo6zuwPgCWD/V5YQEgaRKeW/uxy4fhFO9FsFWmKCtdQ=
-github.com/buildpacks/imgutil v0.0.0-20200313170640-a02052f47d62/go.mod h1:TjPmM78urjQIiMal4T7en6iBekAPv6z1yVMZobc4Kd8=
-github.com/buildpacks/lifecycle v0.7.1 h1:cfVdxGJJqAoK55kkxTA5HxHPmUNp0NuGgDzRl5f7R/E=
-github.com/buildpacks/lifecycle v0.7.1/go.mod h1:k41tT3XOt7ufaMGAvOpEsXyuJpUPoo4F686Z652lU3E=
+github.com/buildpacks/lifecycle v0.7.2 h1:FO7i2cokLNc7lcuThq/LYt1jmkB8HBrjpK+2GWWsaLI=
+github.com/buildpacks/lifecycle v0.7.2/go.mod h1:k41tT3XOt7ufaMGAvOpEsXyuJpUPoo4F686Z652lU3E=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

diff --git a/testhelpers/registry.go b/testhelpers/registry.go
@@ -19,7 +19,7 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
-var registryContainerName = "registry:2"
+var registryContainerName = "micahyoung/registry:2"
 
 type TestRegistryConfig struct {
 	runRegistryName string

diff --git a/vendor/github.com/buildpacks/imgutil/.travis.yml b/vendor/github.com/buildpacks/imgutil/.travis.yml
diff --git a/vendor/github.com/buildpacks/imgutil/Makefile b/vendor/github.com/buildpacks/imgutil/Makefile
diff --git a/vendor/github.com/buildpacks/imgutil/README.md b/vendor/github.com/buildpacks/imgutil/README.md
diff --git a/vendor/github.com/buildpacks/imgutil/fakes/image.go b/vendor/github.com/buildpacks/imgutil/fakes/image.go
diff --git a/vendor/github.com/buildpacks/imgutil/go.mod b/vendor/github.com/buildpacks/imgutil/go.mod
diff --git a/vendor/github.com/buildpacks/imgutil/go.sum b/vendor/github.com/buildpacks/imgutil/go.sum
diff --git a/vendor/github.com/buildpacks/imgutil/golangci.yaml b/vendor/github.com/buildpacks/imgutil/golangci.yaml
diff --git a/vendor/github.com/buildpacks/imgutil/image.go b/vendor/github.com/buildpacks/imgutil/image.go