From 8ee638a85b80d0286d1607f0ea4acf05293b4e8b Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 19 Dec 2022 13:49:29 +0100 Subject: [PATCH] operator: eliminate redundant operator-validate-bundle This caused a make[1]: *** No rule to make target 'deploy/olm-bundle/100.0.0', needed by 'operator-validate-bundle'. Stop. probably because the recursive make was invoked with an unclean repository, which causes MAJOR_MINOR_PATCH_VERSION to become 100.0.0 instead of the actual tagged version. --- operator/operator.make | 3 --- 1 file changed, 3 deletions(-) diff --git a/operator/operator.make b/operator/operator.make index 3f605e8c5..9286e132a 100644 --- a/operator/operator.make +++ b/operator/operator.make @@ -79,9 +79,6 @@ endif sed -i -e "s;$(BUNDLE_DIR)/;;g" -e "/scorecard/d" -e '/FROM scratch/a LABEL com.redhat.openshift.versions="$(OPENSHIFT_VERSIONS)"' bundle.Dockerfile sed -i -e "/scorecard/d" $(BUNDLE_DIR)/metadata/annotations.yaml mv bundle.Dockerfile $(BUNDLE_DIR) - @make operator-validate-bundle - -operator-validate-bundle: _work/bin/operator-sdk-$(OPERATOR_SDK_VERSION) $(BUNDLE_DIR) @if ! OUT="$$($< bundle validate --select-optional name=operatorhub $(BUNDLE_DIR) 2>&1 && \ $< bundle validate --select-optional name=good-practices $(BUNDLE_DIR) 2>&1 )"; then \ echo >&2 "ERROR: Operator bundle in $(BUNDLE_DIR) did not pass validation:"; \