Merge pull request #537 from tmshort/verify

OPRUN-3022: Add support for make verify to sync script

Author: openshift-merge-robot

Makefile

@@ -105,7 +105,7 @@ bin/cpb: FORCE
 	CGO_ENABLED=0 go build $(GO_BUILD_OPTS) -ldflags '-extldflags "-static"' -o $@ github.com/operator-framework/operator-lifecycle-manager/util/cpb
 
 unit/olm: bin/kubebuilder
-	echo "Running the OLM unit tests"
+	@echo "Running the OLM unit tests"
 	$(MAKE) unit WHAT=operator-lifecycle-manager
 
 unit/registry:
@@ -157,32 +157,33 @@ verify-nested-vendor:
 verify-commits:
 	./scripts/verify_commits.sh $(PULL_BASE_SHA) # see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables
 
+# Update scripts/sync_pop_candidate.sh if anything is changed in this recipe
 .PHONY: verify
 verify:
-	echo "Checking for unstaged root vendor changes"
+	@echo "Checking for unstaged root vendor changes"
 	$(MAKE) verify-vendor
-	echo "Checking whether the CVO manifests need to be generated"
+	@echo "Checking whether the CVO manifests need to be generated"
 	$(MAKE) verify-manifests
-	echo "Checking for unsynced nested [go.mod,go.sum] files"
+	@echo "Checking for unsynced nested [go.mod,go.sum] files"
 	$(MAKE) verify-nested-vendor
-	echo "Checking commit integrity"
+	@echo "Checking commit integrity"
 	$(MAKE) verify-commits
 
 .PHONY: crc-start
 crc-start:
-	echo "Starting CRC"
+	@echo "Starting CRC"
 	./scripts/crc-start.sh
 
 .PHONY: crc-build
 crc-build:
-	echo "Building olm image"
+	@echo "Building olm image"
 	IMG="olm:test" $(MAKE) build/olm-container
-	echo "Building opm image"
+	@echo "Building opm image"
 	IMG="opm:test" $(MAKE) build/registry-container
 
 .PHONY: crc-deploy
 crc-deploy:
-	echo "Deploying OLM"
+	@echo "Deploying OLM"
 	./scripts/crc-deploy.sh
 
 .PHONY: crc

scripts/sync_pop_candidate.sh

@@ -26,7 +26,6 @@ fi
 
 set -o errexit
 set -o pipefail
-#set -x
 
 ROOT_DIR=$(dirname "${BASH_SOURCE[@]}")/..
 # shellcheck disable=SC1091
@@ -63,6 +62,7 @@ function pop() {
     rc="${rcs[2]}"
     printf 'popping: %s\n' "${rc}"
 
+    # Cherrypick the commit
     if ! git cherry-pick --allow-empty --keep-redundant-commits -Xsubtree="${subtree_dir}" "${rc}"; then
         # Always blast away the vendor directory given OLM/registry still commit it into source control.
         git rm -rf "${subtree_dir}"/vendor 2>/dev/null || true
@@ -122,34 +122,54 @@ function pop() {
         popd
     fi
 
-    # 1. Pop next commit off cherrypick set
-    # 2. Cherry-pick
-    # 3. Ammend commit
-    # 4. Remove from cherrypick set
+    # Update commit with make vendor
     if ! make vendor; then
         echo ""
-        echo -e "Pausing script: ${RED}fix make vendor{$RESET}"
+        echo -e "Pausing script: ${RED}fix (or ignore) make vendor{$RESET}"
         echo "Use another terminal window"
-        echo -n '<ENTER> to continue, ^C to quit: '
+        echo -n '<ENTER> to update commit and continue, ^C to quit: '
         read
     fi
     git add "${subtree_dir}" "${ROOT_GENERATED_PATHS[@]}"
-    git status
-    git commit --amend --allow-empty --no-edit --trailer "Upstream-repository: ${remote}" --trailer "Upstream-commit: ${rc}"
-    if ! make manifests; then
+    git commit --amend --allow-empty --no-edit
+
+    # Update commit with make verify-manifests, this uses the proper OLM_VERSION
+    if ! make verify-manifests; then
         echo ""
         echo -e "Pausing script: ${RED}fix (or ignore) make manifests${RESET}"
         echo "Use another terminal window"
-        echo -n '<ENTER> to continue, ^C to quit: '
+        echo -n '<ENTER> to update commit and continue, ^C to quit: '
         read
     fi
     git add "${subtree_dir}" "${ROOT_GENERATED_PATHS[@]}"
-    git status
     git commit --amend --allow-empty --no-edit
 
+    # Update commit with make verify-nested-vendor
+    if ! make verify-nested-vendor; then
+        echo ""
+        echo -e "Pausing script: ${RED}fix make (or ignore) verify-nested-vendors${RESET}"
+        echo "Use another terminal window"
+        echo -n '<ENTER> to update commit and continue, ^C to quit: '
+        read
+    fi
+    git add "${subtree_dir}" "${ROOT_GENERATED_PATHS[@]}"
+    git commit --amend --allow-empty --no-edit --trailer "Upstream-repository: ${remote}" --trailer "Upstream-commit: ${rc}"
+    # need to add these trailers for make verify-commits
+
+    # Remove from cherrypick set, now that the trailers are added, it's effectively complete
     tmp_set=$(mktemp)
     tail -n +2 "${cherrypick_set}" > "${tmp_set}"; cat "${tmp_set}" > "${cherrypick_set}"
 
+    # Verify commit with make verify-commits - this should not error out
+    if ! make verify-commits; then
+        echo ""
+        echo -e "Pausing script: ${RED}fix make verify-commits${RESET}"
+        echo "Use another terminal window"
+        echo -n '<ENTER> to continue, ^C to quit: '
+        read
+    fi
+    # At this point "make verify" would pass
+
     # Note: handle edge case where there's zero remaining to avoid
     # returning a non-zero exit code.
     (( --remaining )) || true