Merge pull request #1587 from paketo-buildpacks/simplify-its

Simplify integration tests
paketo-buildpacks · May 10, 2024 · 22f8660 · 22f8660
2 parents fb5de9c + c779710
commit 22f8660
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 59 deletions.
diff --git a/octo/package-buildpack.sh b/octo/package-buildpack.sh
@@ -44,5 +44,5 @@ if [[ "${PUBLISH:-x}" == "true" ]]; then
 else
   pack -v buildpack package \
     "${PACKAGE}:${VERSION}" ${CONFIG} \
-    --format "${FORMAT}"
+    --format "${FORMAT}" $([ -n "$TTL_SH_PUBLISH" ] && [ "$TTL_SH_PUBLISH" = "true" ] && echo "--publish")
 fi
diff --git a/octo/run-integration-tests.sh b/octo/run-integration-tests.sh
@@ -2,4 +2,4 @@
 
 set -euo pipefail
 
-richgo test ./integration/... -run Integration
+go test ./integration/... -run Integration
diff --git a/octo/statik/statik.go b/octo/statik/statik.go
diff --git a/octo/test.go b/octo/test.go
@@ -110,55 +110,6 @@ func ContributeTest(descriptor Descriptor) (*Contribution, error) {
 		w.Jobs["unit"] = j
 	}
 
-	if len(integrationTestFiles) > 0 {
-		j := actions.Job{
-			Name:   "Integration Test",
-			RunsOn: []actions.VirtualEnvironment{actions.UbuntuLatest},
-			Steps: []actions.Step{
-				{
-					Uses: "actions/checkout@v4",
-				},
-				{
-					Uses: "actions/cache@v4",
-					With: map[string]interface{}{
-						"path":         "${{ env.HOME }}/go/pkg/mod",
-						"key":          "${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}",
-						"restore-keys": "${{ runner.os }}-go-",
-					},
-				},
-				{
-					Uses: "actions/setup-go@v5",
-					With: map[string]interface{}{"go-version": GoVersion},
-				},
-				{
-					Name: "Install create-package",
-					Run:  StatikString("/install-create-package.sh"),
-				},
-				{
-					Name: "Install pack",
-					Run:  StatikString("/install-experimental-pack.sh"),
-				},
-				{
-					Name: "Enable pack Experimental",
-					If:   fmt.Sprintf("${{ %t }}", descriptor.Package.Platform.OS == PlatformWindows),
-					Run:  StatikString("/enable-pack-experimental.sh"),
-				},
-				{
-					Name: "Install richgo",
-					Run:  StatikString("/install-richgo.sh"),
-					Env:  map[string]string{"RICHGO_VERSION": RichGoVersion},
-				},
-				{
-					Name: "Run Tests",
-					Run:  StatikString("/run-integration-tests.sh"),
-					Env:  map[string]string{"RICHGO_FORCE_COLOR": "1"},
-				},
-			},
-		}
-
-		w.Jobs["integration"] = j
-	}
-
 	if descriptor.Builder != nil {
 		j := actions.Job{
 			Name:   "Create Builder Test",
@@ -247,16 +198,40 @@ func ContributeTest(descriptor Descriptor) (*Contribution, error) {
 						"VERSION":              "${{ steps.version.outputs.version }}",
 					},
 				},
-				{
+			},
+		}
+
+		if len(integrationTestFiles) > 0 {
+			j.Steps = append(j.Steps,
+				actions.Step{
+					Name: "Package Buildpack",
+					Run:  StatikString("/package-buildpack.sh"),
+					Env: map[string]string{
+						"FORMAT":         format,
+						"PACKAGES":       "ttl.sh/test-${{ steps.version.outputs.version }}",
+						"VERSION":        "1h",
+						"TTL_SH_PUBLISH": "true",
+					},
+				},
+				actions.Step{
+					Name: "Run Integration Tests",
+					Run:  StatikString("/run-integration-tests.sh"),
+					Env: map[string]string{
+						"PACKAGE": "test",
+						"VERSION": "${{ steps.version.outputs.version }}",
+					},
+				})
+		} else {
+			j.Steps = append(j.Steps,
+				actions.Step{
 					Name: "Package Buildpack",
 					Run:  StatikString("/package-buildpack.sh"),
 					Env: map[string]string{
 						"FORMAT":   format,
 						"PACKAGES": "test",
 						"VERSION":  "${{ steps.version.outputs.version }}",
 					},
-				},
-			},
+				})
 		}
 
 		skipPrefixes := []string{

diff --git a/octo/test_test.go b/octo/test_test.go
@@ -96,15 +96,14 @@ package:
 				var workflow jobs
 				Expect(yaml.Unmarshal(contribution.Content, &workflow)).To(Succeed())
 
-				Expect(len(workflow.Jobs)).To(Equal(3))
+				Expect(len(workflow.Jobs)).To(Equal(2))
 				Expect(workflow.Jobs["unit"]).To(Not(BeNil()))
-				Expect(workflow.Jobs["integration"]).To(Not(BeNil()))
 
 				unitSteps := workflow.Jobs["unit"].Steps
 				Expect(unitSteps[len(unitSteps)-1].Run).Should(ContainSubstring("richgo test ./... -run Unit"))
 
-				integrationSteps := workflow.Jobs["integration"].Steps
-				Expect(integrationSteps[len(integrationSteps)-1].Run).Should(ContainSubstring("richgo test ./integration/... -run Integration"))
+				createPackageSteps := workflow.Jobs["create-package"].Steps
+				Expect(createPackageSteps[len(createPackageSteps)-1].Run).Should(ContainSubstring("go test ./integration/... -run Integration"))
 			})
 		})
 	})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		set -euo pipefail

		richgo test ./integration/... -run Integration
		go test ./integration/... -run Integration