fix ci

Author: diamonwiggins

.github/workflows/mlflow-ci.yml

@@ -42,8 +42,7 @@ jobs:
       - name: Add Helm repositories
         run: |
           cd applications/mlflow
-          make debug-env
-          make debug-helm
+          make add-helm-repositories
 
       - name: Lint charts
         run: |

applications/mlflow/Makefile

@@ -41,44 +41,43 @@ package-and-update: add-helm-repositories
 # Target to add Helm repositories
 .PHONY: add-helm-repositories
 add-helm-repositories:
-	set -e; \
 	helm repo add cnpg https://cloudnative-pg.github.io/charts; \
 	helm repo add minio https://operator.min.io/; \
 	helm repo update
 
 # Target to lint Helm charts using chart-testing
 .PHONY: lint
 lint: add-helm-repositories
-	echo "Linting Helm charts..."
+	echo "Linting Helm charts..."; \
 	if [ -f ./ct.yaml ]; then \
 		ct lint --config ./ct.yaml --chart-dirs $(HELM_CHARTS_DIR) --charts $(HELM_CHARTS_DIR)/mlflow $(HELM_CHARTS_DIR)/infra; \
 	else \
 		echo "Warning: ct.yaml not found. Using default configuration."; \
 		ct lint --chart-dirs $(HELM_CHARTS_DIR) --charts $(HELM_CHARTS_DIR)/mlflow $(HELM_CHARTS_DIR)/infra; \
-	fi
+	fi; \
 	echo "Linting completed successfully."
 
 # Target to template Helm charts (render templates without installing)
 # Explicitly disables the Replicated SDK for testing non-SDK scenarios
 .PHONY: template
 template: add-helm-repositories
-	echo "Templating Helm charts with Replicated SDK disabled..."
-	mkdir -p ./rendered-templates
+	echo "Templating Helm charts with Replicated SDK disabled..."; \
+	mkdir -p ./rendered-templates; \
 	for chart in $(CHARTS); do \
 		echo "Rendering templates for $$chart..."; \
 		if [ "$$chart" = "mlflow" ]; then \
 			helm template $(HELM_CHARTS_DIR)/$$chart --output-dir ./rendered-templates/$$chart --set replicated.enabled=false --debug; \
 		else \
 			helm template $(HELM_CHARTS_DIR)/$$chart --output-dir ./rendered-templates/$$chart --debug; \
 		fi \
-	done
+	done; \
 	echo "Templates rendered in ./rendered-templates directory."
 
 # Target to run a full install test (requires a Kubernetes cluster)
 .PHONY: test
 test: lint template
-	echo "Running full chart installation test..."
-	echo "Note: This requires a connected Kubernetes cluster."
+	echo "Running full chart installation test..."; \
+	echo "Note: This requires a connected Kubernetes cluster."; \
 	if [ -f ./ct.yaml ]; then \
 		ct install --config ./ct.yaml --chart-dirs $(HELM_CHARTS_DIR) \
 			--charts $(HELM_CHARTS_DIR)/infra && \
@@ -90,31 +89,31 @@ test: lint template
 			--charts $(HELM_CHARTS_DIR)/infra && \
 		ct install --chart-dirs $(HELM_CHARTS_DIR) \
 			--charts $(HELM_CHARTS_DIR)/mlflow --set replicated.enabled=false; \
-	fi
+	fi; \
 	echo "Full installation test completed successfully."
 
 # Target to login to the Replicated registry
 .PHONY: registry-login
 registry-login:
-	echo "Authenticating with Replicated registry..."
+	echo "Authenticating with Replicated registry..."; \
 	if [ -z "$$REPLICATED_LICENSE_ID" ]; then \
 		echo "Error: REPLICATED_LICENSE_ID environment variable must be set"; \
 		exit 1; \
-	fi
+	fi; \
 	helm registry login registry.replicated.com \
 		--username="$$REPLICATED_LICENSE_ID" \
-		--password="$$REPLICATED_LICENSE_ID"
+		--password="$$REPLICATED_LICENSE_ID"; \
 	echo "Registry login successful."
 
 # Target to test Helm installation with charts from Replicated registry
 .PHONY: test-replicated-helm
 test-replicated-helm: registry-login
-	echo "Running Helm installation test with charts from Replicated registry..."
-	echo "Note: This requires REPLICATED_APP and REPLICATED_CHANNEL env vars."
+	echo "Running Helm installation test with charts from Replicated registry..."; \
+	echo "Note: This requires REPLICATED_APP and REPLICATED_CHANNEL env vars."; \
 	if [ -z "$$REPLICATED_APP" ] || [ -z "$$REPLICATED_CHANNEL" ]; then \
 		echo "Error: REPLICATED_APP and REPLICATED_CHANNEL must be set"; \
 		exit 1; \
-	fi
+	fi; \
 	if [ -f ./ct.yaml ]; then \
 		ct install --config ./ct.yaml \
 			--chart-repos "replicated=oci://registry.replicated.com/$$REPLICATED_APP/$$REPLICATED_CHANNEL" \
@@ -130,7 +129,7 @@ test-replicated-helm: registry-login
 		ct install \
 			--chart-repos "replicated=oci://registry.replicated.com/$$REPLICATED_APP/$$REPLICATED_CHANNEL" \
 			--charts "replicated/mlflow"; \
-	fi
+	fi; \
 	echo "Replicated Helm installation test completed successfully."
 
 # Example target to check versions (optional)
@@ -157,7 +156,6 @@ clean: clean-charts clean-templates
 # Debug target to print environment information
 .PHONY: debug-env
 debug-env:
-	set -e; \
 	echo '=== Debug Environment Information ==='; \
 	echo "Shell: $$SHELL"; \
 	echo "PATH: $$PATH"; \
@@ -170,7 +168,6 @@ debug-env:
 # Debug target for testing helm repo commands
 .PHONY: debug-helm
 debug-helm:
-	set -e; \
 	echo "=== Testing Helm Commands ==="; \
 	echo "Helm version:"; \
 	helm version; \