fix

vdaas · Dec 25, 2024 · a3fd605 · a3fd605
1 parent 4e5e046
commit a3fd605
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/_detect-ci-container.yaml b/.github/workflows/_detect-ci-container.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Get Docker image tag from detection result
         id: get_tag_name
         run: |
-          TAG=$(echo "$TAGS" | awk '{print $1}' | awk -F '=' '{print $2}')
+          TAG=$(echo "$TAGS" | awk '{print $1}' | awk -F '=' '{print $2}' | sed -e 's/"//g')
           echo "TAG=${TAG}"
           echo "TAG=${TAG}" >> $GITHUB_OUTPUT
         env:

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -335,12 +335,12 @@ jobs:
             E2E_UPDATE_COUNT=100 \
             E2E_UPSERT_COUNT=100 \
             E2E_REMOVE_COUNT=100 \
-            E2E_WAIT_FOR_CREATE_INDEX_DURATION=3m \
+            E2E_WAIT_FOR_CREATE_INDEX_DURATION=10m \
             E2E_TARGET_POD_NAME=${POD_NAME} \
             E2E_TARGET_NAMESPACE=default \
             e2e/readreplica
         env:
-          POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }}
+          POD_NAME: ${{ steps.deploy_vald_readreplica.outputs.POD_NAME }}
   e2e-stream-crud-with-mirror:
     name: "E2E test (Stream CRUD) with mirror"
     needs: [detect-ci-container]

diff --git a/Makefile.d/kind.mk b/Makefile.d/kind.mk
@@ -20,16 +20,15 @@ SNAPSHOTTER_VERSION=v8.2.0
 ## install KinD
 kind/install: $(BINDIR)/kind
 
-$(BINDIR)/kind:
+$(BINDIR)/kind: $(BINDIR)/docker
 	mkdir -p $(BINDIR)
 	$(eval DARCH := $(subst aarch64,arm64,$(ARCH)))
 	curl -fsSL https://github.com/kubernetes-sigs/kind/releases/download/v$(KIND_VERSION)/kind-$(OS)-$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/kind
 	chmod a+x $(BINDIR)/kind
 
 .PHONY: kind/start
 ## start kind (kubernetes in docker) cluster
-kind/start: \
-	$(BINDIR)/docker
+kind/start:
 	kind create cluster --name $(NAME)
 	@make kind/login
 
@@ -40,8 +39,7 @@ kind/login:
 
 .PHONY: kind/stop
 ## stop kind (kubernetes in docker) cluster
-kind/stop: \
-	$(BINDIR)/docker
+kind/stop:
 	kind delete cluster --name $(NAME)
 
 .PHONY: kind/restart
@@ -76,8 +74,7 @@ kind/cluster/restart: \
 
 .PHONY: kind/vs/start
 ## start kind (kubernetes in docker) cluster with volume snapshot
-kind/vs/start: \
-	$(BINDIR)/docker
+kind/vs/start:
 	sed -e 's/apiServerAddress: "127.0.0.1"/apiServerAddress: "$(shell grep host.docker.internal /etc/hosts | cut -f1)"/' $(ROOTDIR)/k8s/debug/kind/e2e.yaml | kind create cluster --name $(NAME)-vs --config - 
 	@make kind/vs/login
 
@@ -101,8 +98,7 @@ kind/vs/start: \
 
 .PHONY: kind/vs/stop
 ## stop kind (kubernetes in docker) cluster with volume snapshot
-kind/vs/stop: \
-	$(BINDIR)/docker
+kind/vs/stop:
 	kind delete cluster --name $(NAME)-vs
 
 .PHONY: kind/vs/login