Skip to content

Commit

Permalink
Use common fork
Browse files Browse the repository at this point in the history
  • Loading branch information
sutaakar committed May 21, 2024
1 parent 4652de5 commit 9983ab0
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 114 deletions.
18 changes: 15 additions & 3 deletions .github/workflows/e2e_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,15 @@ jobs:
- name: Checkout common repo code
uses: actions/checkout@v4
with:
repository: 'project-codeflare/codeflare-common'
ref: 'main'
repository: 'sutaakar/codeflare-common'
ref: 'kind'
path: 'common'

- name: Checkout CodeFlare operator repository
uses: actions/checkout@v4
with:
repository: project-codeflare/codeflare-operator
repository: sutaakar/codeflare-operator
ref: 'kind'
path: codeflare-operator

- name: Set Go
Expand Down Expand Up @@ -113,6 +114,8 @@ jobs:
kubectl create clusterrolebinding sdk-user-clusterqueue-creator --clusterrole=clusterqueue-creator --user=sdk-user
kubectl create clusterrole localqueue-creator --verb=get,list,create,delete,patch --resource=localqueues
kubectl create clusterrolebinding sdk-user-localqueue-creator --clusterrole=localqueue-creator --user=sdk-user
kubectl create clusterrole list-secrets --verb=get,list --resource=secrets
kubectl create clusterrolebinding sdk-user-list-secrets --clusterrole=list-secrets --user=sdk-user
kubectl config use-context sdk-user
- name: Run e2e tests
Expand All @@ -125,11 +128,20 @@ jobs:
poetry install --with test,docs
echo "Running e2e tests..."
poetry run pytest -v -s ./tests/e2e -m kind > ${CODEFLARE_TEST_OUTPUT_DIR}/pytest_output.log 2>&1
env:
GRPC_DNS_RESOLVER: "native"

- name: Switch to kind-cluster context to print logs
if: always() && steps.deploy.outcome == 'success'
run: kubectl config use-context kind-cluster

- name: Print all
if: always()
run: |
kubectl get Ingress -A -o yaml
echo "******************"
kubectl get pods -n ingress-nginx -o yaml
- name: Print CodeFlare operator logs
if: always() && steps.deploy.outcome == 'success'
run: |
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/local_interactive_sdk_kind_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from codeflare_sdk import Cluster, ClusterConfiguration, TokenAuthentication
from codeflare_sdk import Cluster, ClusterConfiguration, TokenAuthentication, generate_cert

import pytest
import ray
Expand All @@ -12,15 +12,11 @@ class TestRayLocalInteractiveOauth:
def setup_method(self):
initialize_kubernetes_client(self)

def teardown_method(self):
delete_namespace(self)

def test_local_interactives(self):
self.setup_method()
create_namespace(self)
create_kueue_resources(self)
self.run_local_interactives()
self.teardown_method()

def run_local_interactives(self):
ray_image = get_ray_image()
Expand All @@ -47,6 +43,10 @@ def run_local_interactives(self):
cluster.up()
cluster.wait_ready()

generate_cert.generate_tls_cert(cluster_name, self.namespace)
generate_cert.export_env(cluster_name, self.namespace)

print(cluster.local_client_url())
ray.shutdown()
ray.init(address=cluster.local_client_url(), logging_level="DEBUG")

Expand Down
106 changes: 0 additions & 106 deletions tests/e2e/mnist_raycluster_sdk_kind_test.py

This file was deleted.

0 comments on commit 9983ab0

Please sign in to comment.