From e4faa456c8d4058cdde4f4e6ee9dfd0ce40e1eca Mon Sep 17 00:00:00 2001 From: Alex Thomas Date: Tue, 20 Aug 2024 11:15:02 +0100 Subject: [PATCH 1/3] Added Docker Hub login to E2E tests --- .github/workflows/pr-e2e-tests.yaml | 9 +++++++++ .github/workflows/scheduled-e2e-tests.yaml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/pr-e2e-tests.yaml b/.github/workflows/pr-e2e-tests.yaml index 8a34bd2c6..b4d44ae79 100644 --- a/.github/workflows/pr-e2e-tests.yaml +++ b/.github/workflows/pr-e2e-tests.yaml @@ -25,6 +25,9 @@ jobs: image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: ENABLE_CUDA: '0' + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} weaviate: image: cr.weaviate.io/semitechnologies/weaviate:1.25.1 env: @@ -36,6 +39,9 @@ jobs: ports: - 8080:8080 - 50051:50051 + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} neo4j: image: neo4j:${{ matrix.neo4j-version }}-${{ matrix.neo4j-edition }} env: @@ -45,6 +51,9 @@ jobs: ports: - 7687:7687 - 7474:7474 + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Check out repository code diff --git a/.github/workflows/scheduled-e2e-tests.yaml b/.github/workflows/scheduled-e2e-tests.yaml index b9c4328a0..8129156ec 100644 --- a/.github/workflows/scheduled-e2e-tests.yaml +++ b/.github/workflows/scheduled-e2e-tests.yaml @@ -23,6 +23,9 @@ jobs: image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: ENABLE_CUDA: '0' + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} weaviate: image: cr.weaviate.io/semitechnologies/weaviate:1.25.1 env: @@ -34,6 +37,9 @@ jobs: ports: - 8080:8080 - 50051:50051 + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} neo4j: image: neo4j:${{ matrix.neo4j-version }}-${{ matrix.neo4j-edition }} env: @@ -43,6 +49,9 @@ jobs: ports: - 7687:7687 - 7474:7474 + credentials: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Check out repository code From f09580c99b2b8ea65521cada610c0fc03442b4e3 Mon Sep 17 00:00:00 2001 From: Alex Thomas Date: Tue, 20 Aug 2024 11:28:14 +0100 Subject: [PATCH 2/3] Weaviate container is now pulled from Docker Hub --- .github/workflows/pr-e2e-tests.yaml | 4 ++-- .github/workflows/scheduled-e2e-tests.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-e2e-tests.yaml b/.github/workflows/pr-e2e-tests.yaml index b4d44ae79..dbef530c5 100644 --- a/.github/workflows/pr-e2e-tests.yaml +++ b/.github/workflows/pr-e2e-tests.yaml @@ -22,14 +22,14 @@ jobs: - enterprise services: t2v-transformers: - image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx + image: semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: ENABLE_CUDA: '0' credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} weaviate: - image: cr.weaviate.io/semitechnologies/weaviate:1.25.1 + image: semitechnologies/weaviate:1.25.1 env: TRANSFORMERS_INFERENCE_API: 'http://t2v-transformers:8080' AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true' diff --git a/.github/workflows/scheduled-e2e-tests.yaml b/.github/workflows/scheduled-e2e-tests.yaml index 8129156ec..a7cb3a172 100644 --- a/.github/workflows/scheduled-e2e-tests.yaml +++ b/.github/workflows/scheduled-e2e-tests.yaml @@ -20,14 +20,14 @@ jobs: - enterprise services: t2v-transformers: - image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx + image: semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: ENABLE_CUDA: '0' credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} weaviate: - image: cr.weaviate.io/semitechnologies/weaviate:1.25.1 + image: semitechnologies/weaviate:1.25.1 env: TRANSFORMERS_INFERENCE_API: 'http://t2v-transformers:8080' AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true' From 8be44c1598baa85b36ff112e079d9fb9e80d8dfd Mon Sep 17 00:00:00 2001 From: Alex Thomas Date: Tue, 20 Aug 2024 11:43:39 +0100 Subject: [PATCH 3/3] Reverted cr.weaviate.io removal from E2E tests --- .github/workflows/pr-e2e-tests.yaml | 4 ++-- .github/workflows/scheduled-e2e-tests.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-e2e-tests.yaml b/.github/workflows/pr-e2e-tests.yaml index dbef530c5..b4d44ae79 100644 --- a/.github/workflows/pr-e2e-tests.yaml +++ b/.github/workflows/pr-e2e-tests.yaml @@ -22,14 +22,14 @@ jobs: - enterprise services: t2v-transformers: - image: semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx + image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: ENABLE_CUDA: '0' credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} weaviate: - image: semitechnologies/weaviate:1.25.1 + image: cr.weaviate.io/semitechnologies/weaviate:1.25.1 env: TRANSFORMERS_INFERENCE_API: 'http://t2v-transformers:8080' AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true' diff --git a/.github/workflows/scheduled-e2e-tests.yaml b/.github/workflows/scheduled-e2e-tests.yaml index a7cb3a172..8129156ec 100644 --- a/.github/workflows/scheduled-e2e-tests.yaml +++ b/.github/workflows/scheduled-e2e-tests.yaml @@ -20,14 +20,14 @@ jobs: - enterprise services: t2v-transformers: - image: semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx + image: cr.weaviate.io/semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2-onnx env: ENABLE_CUDA: '0' credentials: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} weaviate: - image: semitechnologies/weaviate:1.25.1 + image: cr.weaviate.io/semitechnologies/weaviate:1.25.1 env: TRANSFORMERS_INFERENCE_API: 'http://t2v-transformers:8080' AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'