test: Parameterize CodeFlare SDK version

Author: astefanutti

Makefile

@@ -24,6 +24,9 @@ MCAD_CRD ?= ${MCAD_REPO}/config/crd?ref=${MCAD_REF}
 # KUBERAY_VERSION defines the default version of the KubeRay operator
 KUBERAY_VERSION ?= v0.5.0
 
+# CODEFLARE_SDK_VERSION defines the default version of the CodeFlare SDK
+CODEFLARE_SDK_VERSION ?= 0.4.4
+
 # OPERATORS_REPO_ORG points to GitHub repository organization where bundle PR is opened against
 # OPERATORS_REPO_FORK_ORG points to GitHub repository fork organization where bundle build is pushed to
 OPERATORS_REPO_ORG ?= redhat-openshift-ecosystem
@@ -132,6 +135,7 @@ defaults:
 	@echo "const (" >> $(DEFAULTS_FILE)
 	@echo "  MCADImage = \"$(MCAD_IMAGE)\"" >> $(DEFAULTS_FILE)
 	@echo "  InstaScaleImage = \"$(INSTASCALE_IMAGE)\"" >> $(DEFAULTS_FILE)
+	@echo "  CodeFlareSDKVersion = \"$(CODEFLARE_SDK_VERSION)\"" >> $(DEFAULTS_FILE)
 	@echo "" >> $(DEFAULTS_FILE)
 	@echo ")" >> $(DEFAULTS_FILE)
 	@echo "" >> $(DEFAULTS_FILE)

controllers/defaults.go

@@ -5,6 +5,7 @@ package controllers
 // ***********************
 
 const (
-	MCADImage       = "quay.io/project-codeflare/mcad-controller:release-v1.31.0"
-	InstaScaleImage = "quay.io/project-codeflare/instascale-controller:v0.0.4"
+	MCADImage           = "quay.io/project-codeflare/mcad-controller:release-v1.31.0"
+	InstaScaleImage     = "quay.io/project-codeflare/instascale-controller:v0.0.4"
+	CodeFlareSDKVersion = "0.4.4"
 )

test/e2e/mnist_raycluster_sdk_test.go

@@ -155,7 +155,7 @@ func TestMNISTRayClusterSDK(t *testing.T) {
 						{
 							Name:    "test",
 							Image:   "quay.io/opendatahub/notebooks:jupyter-minimal-ubi8-python-3.8-4c8f26e",
-							Command: []string{"/bin/sh", "-c", "pip install codeflare-sdk==0.4.4 && cp /test/* . && python mnist_raycluster_sdk.py" + " " + namespace.Name},
+							Command: []string{"/bin/sh", "-c", "pip install codeflare-sdk==" + GetCodeFlareSDKVersion() + " && cp /test/* . && python mnist_raycluster_sdk.py" + " " + namespace.Name},
 							VolumeMounts: []corev1.VolumeMount{
 								{
 									Name:      "test",

test/support/codeflare.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package support
+
+import (
+	"os"
+
+	"github.com/project-codeflare/codeflare-operator/controllers"
+)
+
+func GetCodeFlareSDKVersion() string {
+	if value, ok := os.LookupEnv("CODEFLARE_SDK_VERSION"); ok {
+		return value
+	}
+	return controllers.CodeFlareSDKVersion
+}