Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions test/e2e/nemo-dependencies/evaluator/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ argo:
helm_repo_url: "https://argoproj.github.io/argo-helm"
chart_name: "argo/argo-workflows"

# MongoDB Helm chart details
mongodb:
enabled: true
helm_repo_name: "mongodb"
helm_repo_url: "https://charts.bitnami.com/bitnami"
chart_name: "mongodb/mongodb"
chart_version: "14.8.2"
username: "root"
password: "examplepassword"
database: "evaluations"

# Milvus Helm chart details
milvus:
enabled: true
Expand Down Expand Up @@ -59,4 +48,4 @@ postgresql:

localPathProvisioner:
enabled: true
version: v0.0.31
version: v0.0.31
4 changes: 1 addition & 3 deletions test/e2e/nemo-dependencies/evaluator/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@
when: localPathProvisioner.enabled
- include_tasks: argo-workflow.yaml
when: argo.enabled
- include_tasks: mongodb.yaml
when: mongodb.enabled
- include_tasks: milvus.yaml
when: milvus.enabled
- include_tasks: opentelemetry.yaml
when: opentelemetry.enabled
- include_tasks: zipkin.yaml
when: zipkin.enabled
- include_tasks: postgresql.yaml
when: postgresql.enabled
when: postgresql.enabled
2 changes: 1 addition & 1 deletion test/e2e/nemo-dependencies/evaluator/tasks/milvus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
- name: Wait for Milvus pod to be ready
command: kubectl wait --for=condition=Ready pod -n {{ namespace }} -l app.kubernetes.io/instance={{ milvus.helm_repo_name }} --timeout=120s

- name: Get MongoDB pod details
- name: Get Milvus pod details
shell: |
kubectl get pods -n {{ namespace }} -l app.kubernetes.io/instance={{ milvus.helm_repo_name }} -o json
register: milvus_pods
Expand Down
67 changes: 0 additions & 67 deletions test/e2e/nemo-dependencies/evaluator/tasks/mongodb.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions test/e2e/nemo-dependencies/evaluator/tasks/uninstall.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
ignore_errors: true

- name: Uninstall Evaluator helm charts
shell: helm list -n {{ namespace }} | awk '{print $1}' | grep -v NAME | egrep 'evaluator|argo|milvus|mongodb' | xargs helm del -n {{ namespace }}
shell: helm list -n {{ namespace }} | awk '{print $1}' | grep -v NAME | egrep 'evaluator|argo|milvus' | xargs helm del -n {{ namespace }}
ignore_errors: true

- name: Delete Evaluator PVCs
shell: kubectl get pvc -n {{ namespace }} | egrep 'evaluator|volcano|milvus|mongodb' | awk '{print $1}' | xargs kubectl delete pvc -n {{ namespace }}
shell: kubectl get pvc -n {{ namespace }} | egrep 'evaluator|volcano|milvus' | awk '{print $1}' | xargs kubectl delete pvc -n {{ namespace }}
ignore_errors: true

- name: Delete Argo Kubernetes resources
shell: kubectl get {{ item }} | grep argoproj | awk '{print $1}' | xargs kubectl delete {{ item }}
loop:
- crd
ignore_errors: true
ignore_errors: true

This file was deleted.

5 changes: 1 addition & 4 deletions test/e2e/nemo-dependencies/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,4 @@
- "Evaluator DB Name: {{ postgresql.database }}"
- "Evaluator Milvus Password: {{ milvus.password }}"
- "Evaluator Milvus Username: {{ milvus.username }}"
- "Evaluator MongoDB Password: {{ mongodb.password }}"
- "Evaluator MongoDB Username: {{ mongodb.username }}"
- "Evaluator MongoDB Name: {{ mongodb.database }}"
when: install.evaluator == true
when: install.evaluator == true
2 changes: 1 addition & 1 deletion test/e2e/nemo-dependencies/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ uninstall:
entity_store: no
evaluator: no

installation_namespace: nemo
installation_namespace: nemo