update Makefiles as per suggested, remove image wrapper scripts

Author: estroz

.travis.yml

@@ -1,21 +1,6 @@
 os: linux
 dist: xenial
 
-# Install python3 and utilities dependencies
-addons:
-  apt:
-    packages:
-      - "python3"
-      - "python3-pip"
-
-# Python 3.6 is the default Python when language: python.
-# But when not language: python, Python 3 can not be used by default.
-# There is pip (/usr/bin/pip), but not pip3.
-# Because of it the global env is required.
-env:
-  global:
-    - PATH=/opt/python/3.6.7/bin:$PATH
-
 language: go
 go:
 - 1.15.x
@@ -93,7 +78,11 @@ jobs:
     - stage: test
       name: ansible e2e
       <<: *test
+      env:
+        # Required to set python3 as the default python interpreter.
+        - PATH=/opt/python/3.6.7/bin:${PATH}
       before_script:
+        - sudo apt-get install python3 python3-pip
         - pip3 install --upgrade setuptools pip
         - pip install --user ansible~=2.9.13
       script:

Makefile

@@ -49,19 +49,22 @@ clean: ## Cleanup build artifacts and tool binaries.
 
 ##@ Build
 
-.PHONY: build
-build: build/operator-sdk build/ansible-operator build/helm-operator ## Build operator-sdk, ansible-operator, and helm-operator.
-
 .PHONY: install
-GOBIN ?= $(shell go env GOPATH)/bin
-install: ## Install operator-sdk, ansible-operator, and helm-operator in $GOBIN
+install: ## Install operator-sdk, ansible-operator, and helm-operator.
 	go install $(GO_BUILD_ARGS) ./cmd/{operator-sdk,ansible-operator,helm-operator}
 
-# Build operator-sdk project binaries
+.PHONY: build
+build: ## Build operator-sdk, ansible-operator, and helm-operator.
+	@mkdir -p $(BUILD_DIR)
+	go build $(GO_BUILD_ARGS) -o $(BUILD_DIR) ./cmd/{operator-sdk,ansible-operator,helm-operator}
+
+# Build scorecard binaries.
+.PHONY: build/scorecard-test build/scorecard-test-kuttl build/custom-scorecard-tests
 build/scorecard-test build/scorecard-test-kuttl build/custom-scorecard-tests:
-	go build $(GO_GCFLAGS) $(GO_ASMFLAGS) -o $@ ./images/$(@F)
-build/%:
-	go build $(GO_BUILD_ARGS) -o $@ ./cmd/$*
+	go build $(GO_GCFLAGS) $(GO_ASMFLAGS) -o $(BUILD_DIR)/$(@F) ./images/$(@F)
+.PHONY: build/operator-sdk build/ansible-operator build/helm-operator
+build/operator-sdk build/ansible-operator build/helm-operator:
+	go build $(GO_BUILD_ARGS) -o $(BUILD_DIR)/$(@F) ./cmd/$(@F)
 
 ##@ Dev images
 
@@ -73,8 +76,9 @@ image-build: $(foreach i,$(IMAGE_TARGET_LIST),image/$(i)) ## Build all images.
 # Build an image.
 IMAGE_REPO ?= quay.io/operator-framework
 image/%: build/%
-	rm -rf build/_image && mkdir -p build/_image && mv build/$* build/_image
+	rm -rf build/_image && mkdir -p build/_image && cp build/$* build/_image
 	docker build -t $(IMAGE_REPO)/$*:dev -f ./images/$*/Dockerfile build/_image
+	@rm -rf build/_image
 
 ##@ Test
 
@@ -115,9 +119,7 @@ test-e2e-setup: build
 	$(SCRIPTS_DIR)/fetch kind 0.9.0
 	$(SCRIPTS_DIR)/fetch envtest 0.6.3
 	$(SCRIPTS_DIR)/fetch kubectl $(K8S_VERSION) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
-ifeq (,$(findstring $(KIND_CLUSTER),$(shell $(TOOLS_DIR)/kind get clusters -q)))
-	$(TOOLS_DIR)/kind create cluster --image="kindest/node:v$(K8S_VERSION)" --name $(KIND_CLUSTER)
-endif
+	[[ "`$(TOOLS_DIR)/kind get clusters`" =~ "$(KIND_CLUSTER)" ]] || $(TOOLS_DIR)/kind create cluster --image="kindest/node:v$(K8S_VERSION)" --name $(KIND_CLUSTER)
 
 .PHONY: test-e2e-teardown
 test-e2e-teardown:
@@ -126,7 +128,7 @@ test-e2e-teardown:
 	rm -f $(KUBECONFIG)
 
 # Double colon rules allow repeated rule declarations.
-# Repeated rules are exectured in the order they appear.
+# Repeated rules are executed in the order they appear.
 $(e2e_targets):: test-e2e-setup image/scorecard-test
 
 test-e2e:: $(e2e_tests) ## Run e2e tests

hack/image/ansible/Dockerfile

@@ -1,7 +1,5 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ENV CGO_ENABLED=0
-
 RUN microdnf install -y golang make which
 
 ARG BIN=operator-sdk

hack/image/build-ansible-image.sh

@@ -1,13 +1,18 @@
+## This Makefile should only be called from the project root ##
+
 # Needed for glob expansion.
 SHELL = /bin/bash
 .SHELLFLAGS = -O extglob -c
 
-GIT_VERSION = $(shell git describe --dirty --always --tags)
 ifneq ($(DRY_RUN),)
-SNAPSHOT_FLAGS = --snapshot --skip-publish --rm-dist
 TAG ?= $(GIT_VERSION)
 endif
 
+# Ensure that this Makefile is run from the project root (always contains the 'cmd/' directory).
+ifeq (,$(wildcard cmd))
+$(error "This Makefile must be invoked from the operator-sdk project root")
+endif
+
 .PHONY: all
 all: release