Adding the latest java image ubi8/openjdk-11 on ocp 4.6 version as su…

…pported
redhat-developer · Nov 9, 2020 · 739e97b · 739e97b
1 parent 30d9478
commit 739e97b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/pkg/catalog/catalog.go b/pkg/catalog/catalog.go
@@ -30,6 +30,7 @@ var supportedImages = map[string]bool{
  "redhat-openjdk-18/openjdk18-openshift:latest": true,
  "openjdk/openjdk-11-rhel8:latest": true,
  "openjdk/openjdk-11-rhel7:latest": true,
+ "ubi8/openjdk-11:latest": true,
  "centos/nodejs-10-centos7:latest": true,
  "centos/nodejs-12-centos7:latest": true,
  "rhscl/nodejs-10-rhel7:latest": true,

diff --git a/scripts/configure-installer-tests-cluster.sh b/scripts/configure-installer-tests-cluster.sh
@@ -21,7 +21,7 @@ export KUBECONFIG=$ORIGINAL_KUBECONFIG
 USERS="developer odonoprojectattemptscreate odosingleprojectattemptscreate odologinnoproject odologinsingleproject1"
 
 # list of namespace to create
-IMAGE_TEST_NAMESPACES="openjdk-11-rhel8 nodejs-12-rhel7 nodejs-12"
+IMAGE_TEST_NAMESPACES="openjdk-11-rhel8 nodejs-12-rhel7 nodejs-12 openjdk-11"
 
 # Attempt resolution of kubeadmin, only if a CI is not set
 if [ -z $CI ]; then

diff --git a/tests/e2escenarios/e2e_images_test.go b/tests/e2escenarios/e2e_images_test.go
@@ -143,6 +143,11 @@ var _ = Describe("odo supported images e2e tests", func() {
  oc.ImportImageFromRegistry("registry.redhat.io", filepath.Join("ubi8", "nodejs-12:latest"), "nodejs:latest", "nodejs-12")
  verifySupportedImage(filepath.Join("ubi8", "nodejs-12:latest"), "nodejs", "nodejs:latest", "nodejs-12", appName, commonVar.Context)
  })
+
+ It("Should be able to verify the openjdk-11 image", func() {
+ oc.ImportImageFromRegistry("registry.redhat.io", filepath.Join("ubi8", "openjdk-11:latest"), "java:8", "openjdk-11")
+ verifySupportedImage(filepath.Join("ubi8", "openjdk-11:latest"), "openjdk", "java:8", "openjdk-11", appName, commonVar.Context)
+ })
  })
 
 })