RHOAIENG-19043: chore(tests): fix 2024b ci builds after repo restructuring

Author: jiridanek

Makefile

@@ -75,7 +75,7 @@ define build_image
 		$(eval BUILD_ARGS :=)
 	)
 	$(ROOT_DIR)/scripts/sandbox.py --dockerfile '$(2)/Dockerfile' -- \
-		$(CONTAINER_ENGINE) build $(CONTAINER_BUILD_CACHE_ARGS) --tag $(IMAGE_NAME) --file '$(2)/Dockerfile' $(BUILD_ARGS) {}\;
+		$(CONTAINER_ENGINE) build $(RELEASE) $(CONTAINER_BUILD_CACHE_ARGS) --tag $(IMAGE_NAME) --file '$(2)/Dockerfile' $(BUILD_ARGS) {}\;
 endef
 
 # Push function for the notebok image:
@@ -94,10 +94,10 @@ endef
 # BUILD_DEPENDENT_IMAGES: only build images that were explicitly given as a goal on command line
 # PUSH_IMAGES: allows skipping podman push
 define image
-	$(info #*# Image build directory: <$(2)> #(MACHINE-PARSED LINE)#*#...)
+	$(info #*# Image build directory: <$(RELEASE)/$(2)> #(MACHINE-PARSED LINE)#*#...)
 
 	$(if $(or $(BUILD_DEPENDENT_IMAGES:no=), $(filter $@,$(MAKECMDGOALS))),
-		$(call build_image,$(1),$(2),$(3))
+		$(call build_image,$(1),$(RELEASE)/$(2),$(3))
 
 		$(if $(PUSH_IMAGES:no=),
 			$(call push_image,$(1))
@@ -311,7 +311,7 @@ undeploy-c9s-%: bin/kubectl
 .PHONY: test
 test-%: bin/kubectl
 	$(info # Running tests for $* notebook...)
-	@./scripts/test_jupyter_with_papermill.sh $*
+	@./scripts/test_jupyter_with_papermill.sh $(RELEASE) $*
 
 # Validate that runtime image meets minimum criteria
 # This validation is created from subset of https://github.com/elyra-ai/elyra/blob/9c417d2adc9d9f972de5f98fd37f6945e0357ab9/Makefile#L325

ci/cached-builds/gen_gha_matrix_jobs.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import argparse
 import itertools
 import json

scripts/test_jupyter_with_papermill.sh

@@ -99,18 +99,20 @@ function _get_accelerator_flavor()
 #   Returns the absolute path of notebook resources in the notebooks/ repo based on the notebook name
 #
 # Arguments:
-#   $1 : Name of the notebook identifier
-#   $2 : [optional] Subdirectory to append to computed absolute path
+#   $1 : Release to test (2024a, 2024n, ...)
+#   $2 : Name of the notebook identifier
+#   $3 : [optional] Subdirectory to append to computed absolute path
 #		- path should NOT start with a leading /
 #
 # Returns:
 #   Absolute path to the jupyter notebook directory for the given notebook test target
 function _get_jupyter_notebook_directory()
 {
-    local notebook_id="${1:-}"
-    local subpath="${2:-}"
+    local release="${1:-}"
+    local notebook_id="${2:-}"
+    local subpath="${3:-}"
 
-    local jupyter_base="${root_repo_directory}/jupyter"
+    local jupyter_base="${root_repo_directory}/${release}/jupyter"
     local directory="${jupyter_base}/${notebook_id}/${os_flavor}-${python_flavor}${subpath:+"/$subpath"}"
 
     printf '%s' "${directory}"