diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index ef631489ac..d458ba9944 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -227,47 +227,47 @@ jobs: env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-agent-and-sidecar: - name: "E2E Agent & Sidecar test" - needs: [dump-contexts-to-log] - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - uses: actions/checkout@v3 - - - name: Set Git config - run: | - git config --global --add safe.directory ${GITHUB_WORKSPACE} - - - name: Setup E2E environment - id: setup_e2e - uses: ./.github/actions/setup-e2e - with: - target_images: vdaas/vald-agent-ngt vdaas/vald-agent-sidecar - - - name: Deploy Vald - id: deploy_vald - uses: ./.github/actions/e2e-deploy-vald - with: - require_minio: "true" - helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} - values: .github/helm/values/values-agent-sidecar.yaml - wait_for_selector: app=vald-agent-ngt - wait_for_timeout: 29m - - - name: Run E2E Agent & Sidecar - run: | - make hack/benchmark/assets/dataset/${{ env.DATASET }} - make E2E_BIND_PORT=8081 \ - E2E_DATASET_NAME=${{ env.DATASET }} \ - E2E_INSERT_COUNT=10000 \ - E2E_SEARCH_COUNT=4000 \ - E2E_WAIT_FOR_CREATE_INDEX_DURATION=8m \ - E2E_TARGET_POD_NAME=${POD_NAME} \ - E2E_TARGET_NAMESPACE=default \ - e2e/sidecar - env: - POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} + # e2e-agent-and-sidecar: + # name: "E2E Agent & Sidecar test" + # needs: [dump-contexts-to-log] + # runs-on: ubuntu-latest + # timeout-minutes: 60 + # steps: + # - uses: actions/checkout@v3 + # + # - name: Set Git config + # run: | + # git config --global --add safe.directory ${GITHUB_WORKSPACE} + # + # - name: Setup E2E environment + # id: setup_e2e + # uses: ./.github/actions/setup-e2e + # with: + # target_images: vdaas/vald-agent-ngt vdaas/vald-agent-sidecar + # + # - name: Deploy Vald + # id: deploy_vald + # uses: ./.github/actions/e2e-deploy-vald + # with: + # require_minio: "true" + # helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} + # values: .github/helm/values/values-agent-sidecar.yaml + # wait_for_selector: app=vald-agent-ngt + # wait_for_timeout: 29m + # + # - name: Run E2E Agent & Sidecar + # run: | + # make hack/benchmark/assets/dataset/${{ env.DATASET }} + # make E2E_BIND_PORT=8081 \ + # E2E_DATASET_NAME=${{ env.DATASET }} \ + # E2E_INSERT_COUNT=10000 \ + # E2E_SEARCH_COUNT=4000 \ + # E2E_WAIT_FOR_CREATE_INDEX_DURATION=8m \ + # E2E_TARGET_POD_NAME=${POD_NAME} \ + # E2E_TARGET_NAMESPACE=default \ + # e2e/sidecar + # env: + # POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} e2e-stream-crud-with-mirror: name: "E2E test (Stream CRUD) with mirror" @@ -308,34 +308,33 @@ jobs: - name: Deploy Mirror Target run: | kubectl apply -f .github/helm/values/vald-mirror-target.yaml -n vald-01 - sleep 30s - kubectl get pods -A - kubectl get vmt -o wide -A - - # - name: Run E2E CRUD - # run: | - # make hack/benchmark/assets/dataset/${{ env.DATASET }} - # make E2E_BIND_PORT=8081 \ - # E2E_DATASET_NAME=${{ env.DATASET }} \ - # E2E_INSERT_COUNT=10000\ - # E2E_SEARCH_COUNT=10000 \ - # E2E_SEARCH_BY_ID_COUNT=10000 \ - # E2E_GET_OBJECT_COUNT=100 \ - # E2E_UPDATE_COUNT=100 \ - # E2E_UPSERT_COUNT=100 \ - # E2E_REMOVE_COUNT=100 \ - # E2E_WAIT_FOR_CREATE_INDEX_DURATION=3m \ - # E2E_TARGET_POD_NAME=${POD_NAME} \ - # E2E_TARGET_NAMESPACE=vald-01 \ - # e2e - # env: - # POD_NAME: ${{ steps.deploy_vald_01.outputs.POD_NAME }} + sleep 10s + kubectl get pods -A && kubectl get vmt -o wide -A + + - name: Run E2E CRUD + run: | + make hack/benchmark/assets/dataset/${{ env.DATASET }} + make E2E_BIND_PORT=8081 \ + E2E_DATASET_NAME=${{ env.DATASET }} \ + E2E_INSERT_COUNT=10000\ + E2E_SEARCH_COUNT=10000 \ + E2E_SEARCH_BY_ID_COUNT=10000 \ + E2E_GET_OBJECT_COUNT=100 \ + E2E_UPDATE_COUNT=100 \ + E2E_UPSERT_COUNT=100 \ + E2E_REMOVE_COUNT=100 \ + E2E_WAIT_FOR_CREATE_INDEX_DURATION=3m \ + E2E_TARGET_POD_NAME=${POD_NAME} \ + E2E_TARGET_NAMESPACE=vald-01 \ + e2e + env: + POD_NAME: ${{ steps.deploy_vald_01.outputs.POD_NAME }} slack-notification: name: "Slack notification" if: startsWith( github.ref, 'refs/tags/') needs: - - e2e-agent-and-sidecar + # - e2e-agent-and-sidecar - e2e-multiapis-crud - e2e-stream-crud - e2e-stream-crud-for-operator