Skip to content
This repository has been archived by the owner on Oct 22, 2024. It is now read-only.

Commit

Permalink
operator: eliminate redundant operator-validate-bundle
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pohly committed Dec 19, 2022
1 parent 58ca504 commit 8ee638a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions operator/operator.make
Original file line number Diff line number Diff line change
Expand Up @@ -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:"; \
Expand Down

0 comments on commit 8ee638a

Please sign in to comment.