From 8f13ebae796def0881f7102eb0598f7c69855722 Mon Sep 17 00:00:00 2001
From: Alex Jo <jo.alex2144@gmail.com>
Date: Wed, 26 Oct 2022 14:34:53 -0400
Subject: [PATCH 1/3] Update docker images to version 69

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b5190b9eaf5..70a1ac7e5669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <dep.iceberg.version>1.0.0</dep.iceberg.version>
         <dep.spotbugs-annotations.version>4.7.2</dep.spotbugs-annotations.version>
 
-        <dep.docker.images.version>65</dep.docker.images.version>
+        <dep.docker.images.version>69</dep.docker.images.version>
 
         <!--
           America/Bahia_Banderas has:

From d9976b1f46bdfd8903bb98442e4204ffd0ad481a Mon Sep 17 00:00:00 2001
From: Alex Jo <alex.jo@starburstdata.com>
Date: Wed, 5 Oct 2022 16:30:00 -0400
Subject: [PATCH 2/3] Update testing Spark Iceberg docker image name

---
 .../launcher/env/environment/EnvSinglenodeSparkHive.java        | 2 +-
 .../launcher/env/environment/EnvSinglenodeSparkIceberg.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
index c11c16417d2c..2fe141956b24 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkHive.java
@@ -82,7 +82,7 @@ public void extendEnvironment(Environment.Builder builder)
     private DockerContainer createSpark()
     {
         // TODO: Switch to pure Spark 3 image once it's available (https://github.com/trinodb/trino/issues/7063)
-        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3.0-iceberg:" + hadoopImagesVersion, "spark")
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
                 .withEnv("HADOOP_USER_NAME", "hive")
                 .withCopyFileToContainer(
                         forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-hive/spark-defaults.conf")),
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
index d27ded40b6f9..8bcaa3415d22 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java
@@ -81,7 +81,7 @@ public void extendEnvironment(Environment.Builder builder)
     @SuppressWarnings("resource")
     private DockerContainer createSpark()
     {
-        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3.0-iceberg:" + hadoopImagesVersion, "spark")
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/spark3-iceberg:" + hadoopImagesVersion, "spark")
                 .withEnv("HADOOP_USER_NAME", "hive")
                 .withCopyFileToContainer(
                         forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/spark-defaults.conf")),

From 2620cf883bec6882a53bd75ee3252366b4567fb3 Mon Sep 17 00:00:00 2001
From: Yuya Ebihara <ebyhry@gmail.com>
Date: Thu, 27 Oct 2022 12:05:21 +0900
Subject: [PATCH 3/3] empty