merge(#3612): fixed integrated service tests

banzaicloud · Apr 6, 2022 · 73d5a14 · 73d5a14
2 parents 4c62713 + 522de87
commit 73d5a14
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/is-test-v2.yml b/.github/workflows/is-test-v2.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/go-build
-          key: ${{ runner.os }}-go-build-${{ hashFiles('**/*.go', '**/go.mod', '**/go.sum') }}
+          key: ${{ runner.os }}-go-build-${{ hashFiles('*.go', 'go.mod', 'go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-build-
 

diff --git a/.github/workflows/is-test.yml b/.github/workflows/is-test.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/go-build
-          key: ${{ runner.os }}-go-build-${{ hashFiles('**/*.go', '**/go.mod', '**/go.sum') }}
+          key: ${{ runner.os }}-go-build-${{ hashFiles('*.go', 'go.mod', 'go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-build-
 

diff --git a/Makefile b/Makefile
@@ -219,7 +219,7 @@ test-integration: bin/test/kube-apiserver bin/test/etcd ## Run integration tests
 test-integrated-service-up: ## Run integrated service functional tests
 	@echo "Stopping pipeline development stack if it's already running"
 	docker-compose stop
-	if ! kind get kubeconfig --name pipeline-is-test 1>/dev/null; then kind create cluster --name pipeline-is-test --kubeconfig $(HOME)/.kube/kind-pipeline-is-test; fi
+	if ! kind get kubeconfig --name pipeline-is-test 1>/dev/null; then kind create cluster --image kindest/node:v1.21.1 --name pipeline-is-test --kubeconfig $(HOME)/.kube/kind-pipeline-is-test; fi
 	mkdir -p .docker/volumes/{mysql,vault/file,vault/keys}
 	uid=$(shell id -u) gid=$(shell id -g) docker-compose -p pipeline-is-test --project-directory $(PWD) -f $(PWD)/internal/integratedservices/testconfig/docker-compose.yml up -d
 	@while ! test -f $(HOME)/.vault-token; do echo "waiting for vault root token"; docker ps; docker-compose logs --tail 10; sleep 3; done

diff --git a/internal/integratedservices/testconfig/docker-compose.yml b/internal/integratedservices/testconfig/docker-compose.yml
@@ -18,7 +18,7 @@ services:
             - 127.0.0.1:3306:3306
 
     vault:
-        image: vault:1.4.2
+        image: vault:1.6.1
         command: server
         cap_add:
             - IPC_LOCK
@@ -31,7 +31,7 @@ services:
 
     vault-unsealer:
         user: "${uid}:${gid}"
-        image: banzaicloud/bank-vaults:1.7.0
+        image: banzaicloud/bank-vaults:1.10.0
         depends_on:
             - vault
         restart: on-failure
@@ -44,7 +44,7 @@ services:
 
     vault-configurer:
         user: "${uid}:${gid}"
-        image: banzaicloud/bank-vaults:1.7.0
+        image: banzaicloud/bank-vaults:1.10.0
         depends_on:
             - vault
             - vault-unsealer
@@ -69,7 +69,7 @@ services:
             - ./.docker/volumes/vault/keys:/vault/keys
 
     cadence:
-        image: ubercadence/server:0.13.0-auto-setup
+        image: ubercadence/server:0.22.1-auto-setup
         environment:
             LOG_LEVEL: debug,info
             DB: mysql