Merge pull request #1903 from ashish-amarnath/update-ci

🏃 Run CAPD verify scripts in CI

Author: k8s-ci-robot

Makefile

@@ -39,6 +39,7 @@ TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
 BIN_DIR := bin
 E2E_FRAMEWORK_DIR := test/framework
+CAPD_DIR := test/infrastructure/docker
 RELEASE_NOTES_BIN := bin/release-notes
 RELEASE_NOTES := $(TOOLS_DIR)/$(RELEASE_NOTES_BIN)
 
@@ -278,6 +279,7 @@ modules: ## Runs go mod to ensure modules are up to date.
 	cd $(TOOLS_DIR); go mod tidy
 	cd $(E2E_FRAMEWORK_DIR); go mod tidy
 	cd test/e2e; go mod tidy
+	cd $(CAPD_DIR); $(MAKE) modules
 
 ## --------------------------------------
 ## Docker
@@ -490,6 +492,7 @@ verify:
 	./hack/verify-starlark.sh
 	$(MAKE) verify-modules
 	$(MAKE) verify-gen
+	$(MAKE) verify-docker-provider
 
 .PHONY: verify-modules
 verify-modules: modules
@@ -503,6 +506,11 @@ verify-gen: generate
 		echo "generated files are out of date, run make generate"; exit 1; \
 	fi
 
+.PHONY: verify-docker-provider
+verify-docker-provider:
+	@echo "Verifying CAPD"
+	cd $(CAPD_DIR); $(MAKE) verify
+
 ## --------------------------------------
 ## Others / Utilities
 ## --------------------------------------

scripts/ci-make.sh

@@ -20,4 +20,6 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "${REPO_ROOT}" && make lint-full docker-build
+cd "${REPO_ROOT}" && CONTROLLER_IMG=capi-pr-verify make lint-full docker-build
+
+cd "${REPO_ROOT}/test/infrastructure/docker" && CONTROLLER_IMG=capd-pr-verify make docker-build-all

test/infrastructure/docker/hack/verify-all.sh

@@ -37,49 +37,6 @@ failed=()
 outputs=()
 
 # run all verify scripts, optionally skipping any of them
-
-if [[ "${VERIFY_WHITESPACE:-true}" == "true" ]]; then
-  echo "[*] Verifying whitespace..."
-  out=$(hack/verify-whitespace.sh 2>&1)
-  failure $? "verify-whitespace.sh" "${out}"
-  cd "${REPO_PATH}" || exit
-fi
-
-if [[ "${VERIFY_SPELLING:-true}" == "true" ]]; then
-  echo "[*] Verifying spelling..."
-  out=$(hack/verify-spelling.sh 2>&1)
-  failure $? "verify-spelling.sh" "${out}"
-  cd "${REPO_PATH}" || exit
-fi
-
-if [[ "${VERIFY_GOFMT:-true}" == "true" ]]; then
-  echo "[*] Verifying gofmt..."
-  out=$(hack/verify-gofmt.sh 2>&1)
-  failure $? "verify-gofmt.sh" "${out}"
-  cd "${REPO_PATH}" || exit
-fi
-
-if [[ "${VERIFY_GOIMPORTS:-true}" == "true" ]]; then
-  echo "[*] Verifying goimports..."
-  out=$(hack/verify-goimports.sh 2>&1)
-  failure $? "verify-goimports.sh" "${out}"
-  cd "${REPO_PATH}" || exit
-fi
-
-if [[ "${VERIFY_GOLINT:-true}" == "true" ]]; then
-  echo "[*] Verifying golint..."
-  out=$(hack/verify-golint.sh 2>&1)
-  failure $? "verify-golint.sh" "${out}"
-  cd "${REPO_PATH}" || exit
-fi
-
-if [[ "${VERIFY_GOVET:-true}" == "true" ]]; then
-  echo "[*] Verifying govet..."
-  out=$(hack/verify-govet.sh 2>&1)
-  failure $? "verify-govet.sh" "${out}"
-  cd "${REPO_PATH}" || exit
-fi
-
 if [[ "${VERIFY_DEPS:-true}" == "true" ]]; then
   echo "[*] Verifying deps..."
   out=$(hack/verify-deps.sh 2>&1)
@@ -101,13 +58,6 @@ if [[ "${VERIFY_BUILD:-true}" == "true" ]]; then
   cd "${REPO_PATH}" || exit
 fi
 
-if [[ "${VERIFY_DOCKER_BUILD:-true}" == "true" ]]; then
- echo "[*] Verifying manager docker image build..."
- out=$(hack/verify-docker-build.sh 2>&1)
- failure $? "verify-docker-build.sh" "${out}"
- cd "${REPO_PATH}" || exit
-fi
-
 # exit based on verify scripts
 if [[ "${res}" = 0 ]]; then
   echo ""