Backport OKD change from main to release/4.1

maggiehe00 · rjeberhard · commit 7c7a4fd47115 · 2023-07-21T20:59:25.000Z
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -510,6 +510,7 @@
                   **/ItMiiAuxiliaryImage,
                   **/ItMiiAuxiliaryImageCluster,
                   **/ItMiiDomain,
+                  **/ItMiiClusterResource,
                   **/ItMiiDomainModelInPV,
                   **/ItMiiMultiModel,
                   **/ItMiiUpdateDomainConfig,
diff --git a/okdJenkins.sh b/okdJenkins.sh
@@ -45,7 +45,7 @@ checkEnvVars() {
 }
 ver() { printf %02d%02d%02d%02d%02d $(echo "$1" | tr '.' ' '); }
 checkJavaVersion() {
-  java_version=`java -version 2>&1 >/dev/null | grep 'java version' | awk '{print $3}'`
+  java_version=`java -version 2>&1 >/dev/null | grep 'version' | awk '{print $3}'`
   echo "Info: java version ${java_version}"
   if [ $(ver $java_version) -lt $(ver "11.0.10") ]; then
     echo "Error: Java version should be 11.0.10 or higher"

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ checkEnvVars() {`
`45`	`45`	`}`
`46`	`46`	`ver() { printf %02d%02d%02d%02d%02d $(echo "$1" \| tr '.' ' '); }`
`47`	`47`	`checkJavaVersion() {`
`48`		- java_version=`java -version 2>&1 >/dev/null \| grep 'java version' \| awk '{print $3}'`
	`48`	+ java_version=`java -version 2>&1 >/dev/null \| grep 'version' \| awk '{print $3}'`
`49`	`49`	`echo "Info: java version ${java_version}"`
`50`	`50`	`if [ $(ver $java_version) -lt $(ver "11.0.10") ]; then`
`51`	`51`	`echo "Error: Java version should be 11.0.10 or higher"`