Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from pytorch to jupyter-minimal image in notebook tests #111

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Switch from pytorch to jupyter-minimal image in notebook tests #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/main/java/io/odh/test/framework/manager/resources/NotebookResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
public class NotebookResource implements ResourceType<Notebook> {

private static final String REGISTRY_PATH = "image-registry.openshift-image-registry.svc:5000";
public static final String PYTORCH_IMAGE = "pytorch";
public static final String PYTORCH_2023_2_TAG = "2023.2";
public static final String JUPYTER_MINIMAL_IMAGE = "jupyter-minimal-notebook";
public static final String JUPYTER_MINIMAL_2023_2_TAG = "2023.2";
private static final Map<String, String> ODH_IMAGES_MAP;

static {
ODH_IMAGES_MAP = Map.<String, String>of(PYTORCH_IMAGE, "jupyter-pytorch-notebook");
ODH_IMAGES_MAP = Map.<String, String>of(JUPYTER_MINIMAL_IMAGE, "jupyter-minimal-notebook");
}

private static final Map<String, String> RHOAI_IMAGES_MAP;

static {
RHOAI_IMAGES_MAP = Map.<String, String>of(PYTORCH_IMAGE, "pytorch");
RHOAI_IMAGES_MAP = Map.<String, String>of(JUPYTER_MINIMAL_IMAGE, "s2i-minimal-notebook");
}
private static final String NOTEBOOK_TEMPLATE_PATH = "notebook.yaml";
@Override
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/odh/test/e2e/standard/NotebookST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void testCreateSimpleNotebook() throws IOException {
.build();
ResourceManager.getInstance().createResourceWithoutWait(pvc);

String notebookImage = NotebookResource.getNotebookImage(NotebookResource.PYTORCH_IMAGE, NotebookResource.PYTORCH_2023_2_TAG);
String notebookImage = NotebookResource.getNotebookImage(NotebookResource.JUPYTER_MINIMAL_IMAGE, NotebookResource.JUPYTER_MINIMAL_2023_2_TAG);
Notebook notebook = new NotebookBuilder(NotebookResource.loadDefaultNotebook(NTB_NAMESPACE, NTB_NAME, notebookImage)).build();
ResourceManager.getInstance().createResourceWithoutWait(notebook);

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void deployNotebook(String namespace, String name) throws IOException {
.build();
ResourceManager.getInstance().createResourceWithoutWait(pvc);

String notebookImage = NotebookResource.getNotebookImage(NotebookResource.PYTORCH_IMAGE, NotebookResource.PYTORCH_2023_2_TAG);
String notebookImage = NotebookResource.getNotebookImage(NotebookResource.JUPYTER_MINIMAL_IMAGE, NotebookResource.JUPYTER_MINIMAL_2023_2_TAG);
Notebook notebook = new NotebookBuilder(NotebookResource.loadDefaultNotebook(namespace, name, notebookImage)).build();
if (!Environment.PRODUCT.equals(Environment.PRODUCT_DEFAULT)) {
notebook = new NotebookBuilder(NotebookResource.loadDefaultNotebook(namespace, name, notebookImage))
Expand Down
Loading