rebase and resolving conflicts

project-codeflare · Dec 4, 2023 · 25d6fa2 · 25d6fa2
1 parent c70f257
commit 25d6fa2
Show file tree

Hide file tree

Showing 7 changed files with 458 additions and 370 deletions.
diff --git a/.github/workflows/olm_tests.yaml b/.github/workflows/olm_tests.yaml
@@ -121,14 +121,13 @@ jobs:
           OPM_BUNDLE_OPT: "--use-http"
           BUNDLE_PUSH_OPT: "--tls-verify=false"
           CATALOG_PUSH_OPT: "--tls-verify=false"
+
       - name: Run OLM Upgrade e2e Ray cluster Up test
         run: |
           export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
           echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
           set -euo pipefail
-          go test -timeout 30m -v ./test/e2e -run TestMNISTRayClusterUp -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
-        env:
-          RUN_OLM_TESTS: true
+          go test -timeout 30m -v ./test/upgrade -run TestMNISTRayClusterUp -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
 
       - name: Update Operator to the built version
         run: |
@@ -164,9 +163,7 @@ jobs:
           export CODEFLARE_TEST_OUTPUT_DIR=${{ env.TEMP_DIR }}
           echo "CODEFLARE_TEST_OUTPUT_DIR=${CODEFLARE_TEST_OUTPUT_DIR}" >> $GITHUB_ENV
           set -euo pipefail
-          go test -timeout 30m -v ./test/e2e -run TestMnistJobSubmit -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
-        env:
-          RUN_OLM_TESTS: true
+          go test -timeout 30m -v ./test/upgrade -run TestMnistJobSubmit -json 2>&1 | tee ${CODEFLARE_TEST_OUTPUT_DIR}/gotest.log | gotestfmt
 
       - name: Run e2e tests against built operator
         run: |

diff --git a/go.mod b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/onsi/gomega v1.27.10
 	github.com/openshift/api v0.0.0-20230213134911-7ba313770556
 	github.com/project-codeflare/codeflare-common v0.0.0-20231129165224-988ba1da9069
-	github.com/project-codeflare/instascale v0.3.1
 	github.com/project-codeflare/multi-cluster-app-dispatcher v1.38.1
 	github.com/ray-project/kuberay/ray-operator v1.0.0-rc.1
 	go.uber.org/zap v1.26.0

diff --git a/test/e2e/mnist_rayjob.py b/test/e2e/mnist_rayjob.py
@@ -9,7 +9,7 @@
 
 namespace = sys.argv[1]
 
-cluster = Cluster(ClusterConfiguration(name='mnist'))
+cluster = Cluster(ClusterConfiguration(name='mnist',namespace=namespace))
 
 jobdef = DDPJobDefinition(
     name="mnist",

diff --git a/test/e2e/olm_upgrade_test.go b/test/e2e/olm_upgrade_test.go