From ce5988b1951fd743d3e3b4cd15335e3e7d7ab18e Mon Sep 17 00:00:00 2001 From: Rory Z Date: Tue, 30 Aug 2022 20:52:27 +0800 Subject: [PATCH] chore: use minikube instead k3s --- .github/workflows/run_fvt_tests.yaml | 38 ++++------------------------ 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index 5779c5ca3..0728384e6 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -96,17 +96,8 @@ jobs: fi - name: make emqx image run: make ${PROFILE}-docker - - name: install k3s - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" - run: | - sudo sh -c "echo \"127.0.0.1 $(hostname)\" >> /etc/hosts" - curl -sfL https://get.k3s.io | sh - - sudo chmod 644 /etc/rancher/k3s/k3s.yaml - kubectl cluster-info + - run: minikube start - name: install helm - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 sudo chmod 700 get_helm.sh @@ -114,15 +105,12 @@ jobs: helm version - name: setup emqx chart run: | - sudo docker save ${TARGET}:${EMQX_TAG} -o emqx.tar.gz - sudo k3s ctr image import emqx.tar.gz + minikube image load ${TARGET}:${EMQX_TAG} sed -i -r "s/^appVersion: .*$/appVersion: \"${EMQX_TAG}\"/g" deploy/charts/emqx/Chart.yaml sed -i '/emqx_telemetry/d' deploy/charts/emqx/values.yaml - name: run emqx on chart if: matrix.discovery == 'k8s' - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | helm install emqx \ --set image.repository=${TARGET} \ @@ -135,8 +123,6 @@ jobs: --debug - name: run emqx on chart if: matrix.discovery == 'dns' - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | helm install emqx \ --set emqxConfig.EMQX_CLUSTER__DISCOVERY="dns" \ @@ -152,8 +138,6 @@ jobs: deploy/charts/emqx \ --debug - name: waiting emqx started - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" timeout-minutes: 5 run: | while [ "$(kubectl get StatefulSet -l app.kubernetes.io/name=emqx -o jsonpath='{.items[0].status.replicas}')" \ @@ -165,8 +149,6 @@ jobs: sleep 10; done - name: Check ${{ matrix.kind[0]}} cluster - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" timeout-minutes: 10 run: | while @@ -178,22 +160,16 @@ jobs: done - name: get emqx-0 pods log if: failure() - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | kubectl describe pods emqx-0 kubectl logs emqx-0 - name: get emqx-1 pods log if: failure() - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | kubectl describe pods emqx-1 kubectl logs emqx-1 - name: get emqx-2 pods log if: failure() - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | kubectl describe pods emqx-2 kubectl logs emqx-2 @@ -207,16 +183,12 @@ jobs: pip install pytest echo "$HOME/.local/bin" >> $GITHUB_PATH - name: run paho test - env: - KUBECONFIG: "/etc/rancher/k3s/k3s.yaml" run: | - emqx_svc=$(kubectl get svc --namespace default emqx -o jsonpath="{.spec.clusterIP}") - emqx1=$(kubectl get pods emqx-1 -o jsonpath='{.status.podIP}') - emqx2=$(kubectl get pods emqx-2 -o jsonpath='{.status.podIP}') + nohup kubectl port-forward svc/emqx 1883:1883 & - pytest -v paho.mqtt.testing/interoperability/test_client/V5/test_connect.py -k test_basic --host $emqx_svc + pytest -v paho.mqtt.testing/interoperability/test_client/V5/test_connect.py -k test_basic RESULT=$? - pytest -v paho.mqtt.testing/interoperability/test_cluster --host1 $emqx1 --host2 $emqx2 + pytest -v paho.mqtt.testing/interoperability/test_cluster RESULT=$((RESULT + $?)) if [ 0 -ne $RESULT ]; then kubectl logs emqx-1