NO-JIRA: chore(tests/): fix running rstudio rhel9 Makefile image tests

Author: jiridanek

Makefile

@@ -269,6 +269,27 @@ undeploy-c9s-%: bin/kubectl
 	$(info # Undeploying notebook from $(NOTEBOOK_DIR) directory...)
 	$(KUBECTL_BIN) delete -k $(NOTEBOOK_DIR)
 
+.PHONY: deploy-rhel9
+deploy-rhel9-%: bin/kubectl bin/yq
+	$(eval TARGET := $(shell echo $* | sed 's/-rhel9-python.*//'))
+	$(eval PYTHON_VERSION := $(shell echo $* | sed 's/.*-python-//'))
+	$(eval NOTEBOOK_DIR := $(subst -,/,$(subst cuda-,,$(TARGET)))/rhel9-python-$(PYTHON_VERSION)/kustomize/base)
+ifndef NOTEBOOK_TAG
+	$(eval NOTEBOOK_TAG := $*-$(IMAGE_TAG))
+endif
+	$(info # Deploying notebook from $(NOTEBOOK_DIR) directory...)
+	@arg=$(IMAGE_REGISTRY) $(YQ_BIN) e -i '.images[].newName = strenv(arg)' $(NOTEBOOK_DIR)/kustomization.yaml
+	@arg=$(NOTEBOOK_TAG) $(YQ_BIN) e -i '.images[].newTag = strenv(arg)' $(NOTEBOOK_DIR)/kustomization.yaml
+	$(KUBECTL_BIN) apply -k $(NOTEBOOK_DIR)
+
+.PHONY: undeploy-rhel9
+undeploy-rhel9-%: bin/kubectl
+	$(eval TARGET := $(shell echo $* | sed 's/-rhel9-python.*//'))
+	$(eval PYTHON_VERSION := $(shell echo $* | sed 's/.*-python-//'))
+	$(eval NOTEBOOK_DIR := $(subst -,/,$(subst cuda-,,$(TARGET)))/rhel9-python-$(PYTHON_VERSION)/kustomize/base)
+	$(info # Undeploying notebook from $(NOTEBOOK_DIR) directory...)
+	$(KUBECTL_BIN) delete -k $(NOTEBOOK_DIR)
+
 # Verify the notebook's readiness by pinging the /api endpoint and executing the corresponding test_notebook.ipynb file in accordance with the build chain logic.
 .PHONY: test
 test-%: bin/kubectl

ci/cached-builds/make_test.py

@@ -141,7 +141,8 @@ def wait_for_stability(pod: str) -> None:
     timeout = 100
     for _ in range(3):
         call(
-            f"timeout {timeout}s bash -c 'until kubectl wait --for=condition=Ready pods --all --timeout 5s; do sleep 1; done'", shell=True)
+            f"timeout {timeout}s bash -c 'until kubectl wait --for=condition=Ready pods --all --timeout 5s; do sleep 1; done'",
+            shell=True)
         timeout = 50
         time.sleep(3)
 
@@ -198,6 +199,15 @@ def test_make_commands_rstudio(self, mock_execute: unittest.mock.Mock) -> None:
         assert "make validate-rstudio-image image=rstudio-c9s-python-3.11" in commands
         assert "make undeploy-c9s-rstudio-c9s-python-3.11" in commands
 
+    @unittest.mock.patch("make_test.execute")
+    def test_make_commands_rsudio_rhel(self, mock_execute: unittest.mock.Mock) -> None:
+        """Compares the commands with what we had in the openshift/release yaml"""
+        run_tests("rstudio-rhel9-python-3.11")
+        commands: list[str] = [c[0][1][0] for c in mock_execute.call_args_list]
+        assert "make deploy-rhel9-rstudio-rhel9-python-3.11" in commands
+        assert "make validate-rstudio-image image=rstudio-rhel9-python-3.11" in commands
+        assert "make undeploy-rhel9-rstudio-rhel9-python-3.11" in commands
+
     @unittest.mock.patch("make_test.execute")
     def test_make_commands_cuda_rstudio(self, mock_execute: unittest.mock.Mock) -> None:
         """Compares the commands with what we had in the openshift/release yaml"""
@@ -207,6 +217,15 @@ def test_make_commands_cuda_rstudio(self, mock_execute: unittest.mock.Mock) -> N
         assert "make validate-rstudio-image image=cuda-rstudio-c9s-python-3.11" in commands
         assert "make undeploy-c9s-rstudio-c9s-python-3.11" in commands
 
+    @unittest.mock.patch("make_test.execute")
+    def test_make_commands_cuda_rstudio_rhel(self, mock_execute: unittest.mock.Mock) -> None:
+        """Compares the commands with what we had in the openshift/release yaml"""
+        run_tests("cuda-rstudio-rhel9-python-3.11")
+        commands: list[str] = [c[0][1][0] for c in mock_execute.call_args_list]
+        assert "make deploy-rhel9-rstudio-rhel9-python-3.11" in commands
+        assert "make validate-rstudio-image image=cuda-rstudio-rhel9-python-3.11" in commands
+        assert "make undeploy-rhel9-rstudio-rhel9-python-3.11" in commands
+
     @unittest.mock.patch("make_test.execute")
     def test_make_commands_runtime(self, mock_execute: unittest.mock.Mock) -> None:
         """Compares the commands with what we had in the openshift/release yaml"""