From 76ec9b9d7194b51768b224937059c80de986a6b3 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Tue, 5 Nov 2024 06:43:41 +0100
Subject: [PATCH] HDDS-11639. Upgrade ozone-runner to Rocky Linux 9.3 (#7391)

---
 hadoop-ozone/dist/pom.xml                                 | 2 +-
 .../dist/src/main/smoketest/s3/objectcopys3a.robot        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 80efa7a82be..b0fd526b809 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -28,7 +28,7 @@
   <properties>
     <file.encoding>UTF-8</file.encoding>
     <downloadSources>true</downloadSources>
-    <docker.ozone-runner.version>20241022-jdk17-1</docker.ozone-runner.version>
+    <docker.ozone-runner.version>20241104-jdk17-1</docker.ozone-runner.version>
     <docker.ozone-testkr5b.image>apache/ozone-testkrb5:20230318-1</docker.ozone-testkr5b.image>
     <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so far -->
   </properties>
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/objectcopys3a.robot b/hadoop-ozone/dist/src/main/smoketest/s3/objectcopys3a.robot
index fead57ca31c..96fd1e62fc8 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/objectcopys3a.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/objectcopys3a.robot
@@ -31,19 +31,19 @@ Put object s3a simulation
                         Execute                    echo "Randomtext" > /tmp/testfile
     ${result} =         Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt    255
     ${result} =         Execute AWSS3ApiCli        list-objects --bucket ${BUCKET} --prefix ${PREFIX}/word.txt/
-                        Should Not contain         ${result}   word.txt
+                        Should Not Match Regexp    ${result}   "Key".*word.txt
 
     ${result} =         Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt._COPYING_    255
     ${result} =         Execute AWSS3ApiCli        list-objects --bucket ${BUCKET} --prefix ${PREFIX}/word.txt._COPYING_/
-                        Should Not contain         ${result}  word.txt._COPYING_
+                        Should Not Match Regexp    ${result}   "Key".*word.txt._COPYING_
 
     ${result} =         Execute AWSS3ApiCli        put-object --bucket ${BUCKET} --key ${PREFIX}/word.txt._COPYING_ --body /tmp/testfile
                         Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt._COPYING_    0
                         Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt    255
     ${result} =         Execute AWSS3ApiCli        list-objects --bucket ${BUCKET} --prefix ${PREFIX}/word.txt/
-                        Should Not contain         ${result}  word.txt._COPYING_
+                        Should Not Match Regexp    ${result}   "Key".*word.txt._COPYING_
 
     ${result} =         Execute AWSS3ApiCli        copy-object --bucket ${BUCKET} --key ${PREFIX}/word.txt --copy-source ${BUCKET}/${PREFIX}/word.txt._COPYING_
                         Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt    0
                         Execute AWSS3APICli        delete-object --bucket ${BUCKET} --key ${PREFIX}/word.txt._COPYING_
-                        Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt._COPYING_    255
\ No newline at end of file
+                        Execute AWSS3APICli and checkrc    head-object --bucket ${BUCKET} --key ${PREFIX}/word.txt._COPYING_    255