stembuild: cleanup Makefile targets

- improve naming
- remove unused builds

Author: aramprice

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
         go-version-file: stembuild/go.mod
     - name: Provide `StemcellAutomation.zip` for `go:embed` consumption in `assets` package
       run: |
-        make generate-fake-stemcell-automation
+        make stubbed-stemcell-automation-zip
       working-directory: stembuild
     - uses: golangci/golangci-lint-action@v8
       with:
@@ -33,7 +33,7 @@ jobs:
         go-version-file: stembuild/go.mod
     - name: Provide `StemcellAutomation.zip` for `go:embed` consumption in `assets` package
       run: |
-        make generate-fake-stemcell-automation
+        make stubbed-stemcell-automation-zip
       working-directory: stembuild
     # skip specs for packager,ovftool because `ovftool` binary is required
     - run: |

ci/tasks/build-stembuild-linux/run.sh

@@ -12,7 +12,7 @@ cp "${ROOT_DIR}"/${STEMCELL_AUTOMATION_ZIP} \
 
 pushd "${ROOT_DIR}/stemcell-builder/stembuild"
   echo '***Building Stembuild***'
-  make STEMCELL_VERSION="${VERSION}" build
+  make STEMCELL_VERSION="${VERSION}" stembuild
 popd
 
 echo '***Copying stembuild to output directory***'

ci/tasks/build-stembuild-windows/run.ps1

@@ -17,7 +17,7 @@ $INPUT_ZIP_GLOB=Join-Path $ROOT_DIR $env:STEMCELL_AUTOMATION_ZIP
 
 Copy-Item -Path $INPUT_ZIP_GLOB "assets\StemcellAutomation.zip" -Recurse -Force
 
-make STEMCELL_VERSION=${VERSION} build
+make STEMCELL_VERSION=${VERSION} stembuild
 
 Write-Host ***Copying stembuild to output directory***
 Copy-Item out/stembuild.exe $OUTPUT_DIR/stembuild-windows-x86_64-$VERSION.exe

ci/tasks/test-contract-stembuild-linux/run.sh

@@ -16,5 +16,5 @@ go -C govmomi/vcsim install
 pushd "${ROOT_DIR}/stemcell-builder/stembuild"
   echo ***Test Stembuild Code***
 
-  make contract
+  make iaas_cli
 popd

ci/tasks/test-contract-stembuild-windows/run.ps1

@@ -12,7 +12,7 @@ Write-Host ***Test Stembuild Code***
 
 Set-Location stemcell-builder\stembuild
 
-make contract
+make iaas_cli
 if ($lastexitcode -ne 0)
 {
   throw "contract tests failed"

stembuild/Makefile

@@ -16,51 +16,39 @@ else
 	endif
 endif
 
-all : test build
-
-build : out/stembuild
-
-build-integration : generate-fake-stemcell-automation $(GOSRC)
-	go build -o $(COMMAND) -ldflags $(LD_FLAGS) .
-
-clean :
-	rm -rf version/version.go assets/StemcellAutomation.zip assets/local/* out/*
-
-format :
-	go fmt ./...
-
-integration : generate-fake-stemcell-automation
-	go run github.com/onsi/ginkgo/v2/ginkgo -r -vv --randomize-all --keep-going --flake-attempts 2 --timeout 3h --output-interceptor-mode=none integration
-
-integration/construct : generate-fake-stemcell-automation
-	go run github.com/onsi/ginkgo/v2/ginkgo -r -v --randomize-all --keep-going --flake-attempts 2 --timeout 3h --output-interceptor-mode=none integration/construct
+assets/StemcellAutomation.zip:
+	@echo "Unable to locate assets/StemcellAutomation.zip. This file is bundled into the final stembuild executable and must be present. Please see README.md on how to construct this file."
+	exit 1
 
-integration-badger : generate-fake-stemcell-automation
-	go run github.com/onsi/ginkgo/v2/ginkgo -r -v --randomize-all --until-it-fails --timeout 3h integration
-
-generate-fake-stemcell-automation:
-	$(CP) integration/construct/assets/StemcellAutomation.zip assets/
+all : stembuild stembuild.exe
+stembuild : out/stembuild
+stembuild.exe : out/stembuild.exe
 
 out/stembuild : assets $(GOSRC)
 	CGO_ENABLED=0 go build -o $(COMMAND) -ldflags $(LD_FLAGS) .
 
 out/stembuild.exe : assets $(GOSRC)
 	GOOS=windows CGO_ENABLED=0 go build -o out/stembuild.exe -ldflags $(LD_FLAGS) .
 
-test : units
+clean :
+	rm -rf version/version.go assets/StemcellAutomation.zip out/*
 
-units : format generate-fake-stemcell-automation
-	@go run github.com/onsi/ginkgo/v2/ginkgo version
-	go run github.com/onsi/ginkgo/v2/ginkgo -r --randomize-all --randomize-suites --keep-going --skip-package integration,iaas_cli
-	@echo ""
-	@echo "SWEET SUITE SUCCESS"
 
-contract :
-	go run github.com/onsi/ginkgo/v2/ginkgo -r --randomize-all --randomize-suites --keep-going --flake-attempts 2 iaas_cli
+units : stubbed-stemcell-automation-zip
+	go run github.com/onsi/ginkgo/v2/ginkgo run -r --randomize-all --randomize-suites --keep-going --skip-package integration,iaas_cli
 
-.PHONY : all build build-integration clean format generate-fake-stemcell-automation
-.PHONY : test units units-full integration integration-tests-full
+iaas_cli :
+	go run github.com/onsi/ginkgo/v2/ginkgo run -r --randomize-all --randomize-suites --keep-going --flake-attempts 2 iaas_cli
 
-assets/StemcellAutomation.zip:
-	@echo "Unable to locate assets/StemcellAutomation.zip. This file is bundled into the final stembuild executable and must be present. Please see README.md on how to construct this file."
-	exit 1
+integration-build : stubbed-stemcell-automation-zip $(GOSRC)
+	go build -o $(COMMAND) -ldflags $(LD_FLAGS) .
+
+integration : stubbed-stemcell-automation-zip
+	go run github.com/onsi/ginkgo/v2/ginkgo run -r -vv --timeout 3h --randomize-all --keep-going --flake-attempts 2 integration
+
+stubbed-stemcell-automation-zip :
+	$(CP) integration/construct/assets/StemcellAutomation.zip assets/
+
+
+.PHONY : all stembuild stembuild.exe clean
+.PHONY : units iaas_cli integration integration-build stubbed-stemcell-automation-zip

stembuild/README.md

@@ -288,8 +288,8 @@ ZIP_FILE_DESTINATION="stembuild/assets/StemcellAutomation.zip" \
 ./ci/tasks/zip-files/run.bash
 ```
 
-Use `make build` to build stembuild, providing the corresponding values for the stemcell version you
+Use `make stembuild` to build stembuild, providing the corresponding values for the stemcell version you
 would like to build, for example:
 ```
-STEMBUILD_VERSION=2019.70 make build
+STEMBUILD_VERSION=2019.70 make stembuild
 ```

stembuild/test/helpers/helpers.go

@@ -170,7 +170,7 @@ func ReadFile(name string) (string, error) {
 }
 
 func BuildStembuild(version string) (string, error) {
-	command := exec.Command("make", "build-integration")
+	command := exec.Command("make", "integration-build")
 	command.Env = AddOrReplaceEnvironment(os.Environ(), "STEMBUILD_VERSION", version)
 
 	_, b, _, _ := runtime.Caller(0)
@@ -195,7 +195,7 @@ func BuildStembuild(version string) (string, error) {
 		}
 	}
 
-	panic("Unable to find binary generated by 'make build'")
+	panic("Unable to find binary generated by 'make integration-build'")
 }
 
 func EnvMustExist(variableName string) string {