From 931adcac57a5f8f28a1c2a587f395f418d125f52 Mon Sep 17 00:00:00 2001 From: lwpk110 Date: Fri, 10 Jan 2025 16:23:39 +0800 Subject: [PATCH] ci: add product version matrix and update resource limits --- .github/workflows/test.yml | 2 ++ Makefile | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aef8e9b..46d4033 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,7 @@ jobs: strategy: matrix: k8s-version: ['1.26.15', '1.27.16'] + product-version: ['3.7.1', '3.8.0'] steps: - name: Clone the code uses: actions/checkout@v4 @@ -61,4 +62,5 @@ jobs: KINDTEST_K8S_VERSION: ${{ matrix.k8s-version }} KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }} KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }} + PRODUCT_VERSION: ${{ matrix.product-version }} run: make chainsaw-test diff --git a/Makefile b/Makefile index 9189c53..ac8b318 100644 --- a/Makefile +++ b/Makefile @@ -261,6 +261,7 @@ endif # Tool Versions KINDTEST_K8S_VERSION ?= 1.26.15 CHAINSAW_VERSION ?= v0.2.11 +PRODUCT_VERSION ?= 3.7.1 KIND_IMAGE ?= kindest/node:v${KINDTEST_K8S_VERSION} KIND_KUBECONFIG ?= ./kind-kubeconfig-$(KINDTEST_K8S_VERSION) @@ -314,7 +315,7 @@ chainsaw-setup: ## Run the chainsaw setup .PHONY: chainsaw-test chainsaw-test: chainsaw ## Run the chainsaw test - KUBECONFIG=$(KIND_KUBECONFIG) $(CHAINSAW) test --cluster cluster-1=$(KIND_KUBECONFIG) --test-dir ./test/e2e/ + echo "product_version: $(PRODUCT_VERSION)" | KUBECONFIG=$(KIND_KUBECONFIG) $(CHAINSAW) test --cluster cluster-1=$(KIND_KUBECONFIG) --test-dir ./test/e2e/ --values - .PHONY: chainsaw-cleanup chainsaw-cleanup: ## Run the chainsaw cleanup