Test

medik8s · Mar 14, 2024 · 071a91a · 071a91a
1 parent 0019182
commit 071a91a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/post-submit.yaml b/.github/workflows/post-submit.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Build and push versioned CSV and images for tags
         if: ${{ github.ref_type == 'tag' }}
         # remove leading 'v' from tag!
-        run: export VERSION=$(echo $GITHUB_REF_NAME | sed 's/v//') && make container-build-and-push-community
+        run: export VERSION=$(echo $GITHUB_REF_NAME | sed 's/v//') && export CI_VERSION="9.9.9-ci" && make container-build-and-push-community
 
       - name: Create release with manifests
         if: ${{ github.ref_type == 'tag' }}

diff --git a/.github/workflows/pre-submit.yaml b/.github/workflows/pre-submit.yaml
@@ -23,4 +23,4 @@ jobs: # jobs to run
       run: make check
 
     - name: Build images
-      run: make container-build-community
+      run:  export VERSION=$(echo $GITHUB_REF_NAME) && export CI_VERSION="9.9.9-ci" && make container-build-community
diff --git a/Makefile b/Makefile
@@ -222,7 +222,7 @@ bundle-update: verify-previous-version ## Update CSV fields and validate the bun
 .PHONY: verify-previous-version
 verify-previous-version: ## Verifies that PREVIOUS_VERSION variable is set properly
 	@if [[ ($(PREVIOUS_VERSION) != $(DEFAULT_VERSION) && $(PREVIOUS_VERSION) == $(VERSION)) ||\
-	 ($(PREVIOUS_VERSION) == $(DEFAULT_VERSION) && $(VERSION) != $(DEFAULT_VERSION) && $(VERSION) != $(CI_VERSION)) ]]; then \
+	 ($(PREVIOUS_VERSION) == $(DEFAULT_VERSION) && $(VERSION) != $(DEFAULT_VERSION) && $(CI_VERSION) == "9.9.9-ci" )) ]]; then \
 		echo "Error: PREVIOUS_VERSION must be set for the selected VERSION"; \
     	exit 1; \
 	fi
@@ -425,8 +425,12 @@ container-build: check ## Build containers
 bundle-build-community: bundle-community ## Run bundle community changes in CSV, and then build the bundle image.
 	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
+.PHONY: echoo
+echoo: 
+	@echo "CI_VERSION: $(CI_VERSION)"
+
 .PHONY: container-build-community
-container-build-community: check  ## Build containers for community
+container-build-community: echoo check  ## Build containers for community
 	$(DOCKER_GO) "make bundle-community"
 	make docker-build bundle-build-community