Change JVM time zone in product tests

See prestodb#10078 for discussion.
starburstdata · Jul 13, 2018 · 4131a6b · 4131a6b
1 parent dc89b6a
commit 4131a6b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/presto-hive-hadoop2/bin/run_hive_tests.sh b/presto-hive-hadoop2/bin/run_hive_tests.sh
@@ -17,13 +17,12 @@ stop_unnecessary_hadoop_services
 pushd ${PROJECT_ROOT}
 set +e
 ./mvnw -B -pl presto-hive-hadoop2 test -P test-hive-hadoop2 \
-  -Dhive.hadoop2.timeZone=UTC \
   -DHADOOP_USER_NAME=hive \
   -Dhive.hadoop2.metastoreHost=localhost \
   -Dhive.hadoop2.metastorePort=9083 \
   -Dhive.hadoop2.databaseName=default \
   -Dhive.hadoop2.metastoreHost=hadoop-master \
-  -Dhive.hadoop2.timeZone=Asia/Kathmandu \
+  -Dhive.hadoop2.timeZone=America/Bahia_Banderas \
   -Dhive.metastore.thrift.client.socks-proxy=${PROXY}:1180 \
   -Dsun.net.spi.nameservice.provider.1=default \
   -Dsun.net.spi.nameservice.provider.2=dns,dnsjava \

diff --git a/presto-product-tests/README.md b/presto-product-tests/README.md
@@ -394,7 +394,7 @@ with the following parameters:
     - Use classpath of module: `presto-main`
     - Main class: `com.facebook.presto.server.PrestoServer`
     - Working directory: `presto-product-tests/conf/presto`
-    - VM options: `-ea -Xmx2G -Dconfig=etc/config.properties -Dlog.levels-file=etc/log.properties -DHADOOP_USER_NAME=hive -Duser.timezone=Asia/Kathmandu`
+    - VM options: `-ea -Xmx2G -Dconfig=etc/config.properties -Dlog.levels-file=etc/log.properties -DHADOOP_USER_NAME=hive -Duser.timezone=America/Bahia_Banderas`
 
 5. MAKE SURE PRESTO CONFIGURATION IS ALIGNED WITH THE ONE IN `presto-product-tests/conf/presto`!
 

diff --git a/presto-product-tests/conf/docker/files/run-tempto.sh b/presto-product-tests/conf/docker/files/run-tempto.sh
@@ -16,7 +16,7 @@ fi
 
 java \
   "-Djava.util.logging.config.file=${DOCKER_TEMPTO_CONF_DIR}/logging.properties" \
-  -Duser.timezone=Asia/Kathmandu \
+  -Duser.timezone=America/Bahia_Banderas \
   -cp "/docker/volumes/jdbc/driver.jar:/docker/volumes/presto-product-tests/presto-product-tests-executable.jar" \
   com.facebook.presto.tests.TemptoProductTestRunner \
   --report-dir "/docker/volumes/test-reports" \

diff --git a/presto-product-tests/conf/docker/singlenode-cassandra/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-cassandra/docker-compose.yml
@@ -10,4 +10,4 @@ services:
           - HEAP_NEWSIZE=128M
           - MAX_HEAP_SIZE=512M
       entrypoint: []
-      command: [bash, -cxeu,  "ln -snf /usr/share/zoneinfo/Asia/Kathmandu /etc/localtime && echo Asia/Kathmandu > /etc/timezone && /docker-entrypoint.sh cassandra -f"]
+      command: [bash, -cxeu,  "ln -snf /usr/share/zoneinfo/America/Bahia_Banderas /etc/localtime && echo America/Bahia_Banderas > /etc/timezone && /docker-entrypoint.sh cassandra -f"]
diff --git a/presto-product-tests/conf/presto/etc/jvm.config b/presto-product-tests/conf/presto/etc/jvm.config
@@ -14,6 +14,6 @@
 -XX:+ExitOnOutOfMemoryError
 -XX:ReservedCodeCacheSize=150M
 -DHADOOP_USER_NAME=hive
--Duser.timezone=Asia/Kathmandu
+-Duser.timezone=America/Bahia_Banderas
 #-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 -XX:ErrorFile=/docker/volumes/logs/product-tests-presto-jvm-error-file.log
diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/TemptoProductTestRunner.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/TemptoProductTestRunner.java
@@ -19,7 +19,7 @@
 
 public class TemptoProductTestRunner
 {
-    public static final DateTimeZone PRODUCT_TESTS_TIME_ZONE = DateTimeZone.forID("Asia/Kathmandu");
+    public static final DateTimeZone PRODUCT_TESTS_TIME_ZONE = DateTimeZone.forID("America/Bahia_Banderas");
 
     public static void main(String[] args)
     {

diff --git a/...product-tests/src/main/java/com/facebook/presto/tests/teradata/TestTeradataFunctions.java b/...product-tests/src/main/java/com/facebook/presto/tests/teradata/TestTeradataFunctions.java
@@ -14,11 +14,11 @@
 package com.facebook.presto.tests.teradata;
 
 import io.prestodb.tempto.ProductTest;
-import org.joda.time.DateTimeZone;
 import org.testng.annotations.Test;
 
 import java.sql.Date;
 
+import static com.facebook.presto.tests.TemptoProductTestRunner.PRODUCT_TESTS_TIME_ZONE;
 import static com.facebook.presto.tests.TestGroups.FUNCTIONS;
 import static com.facebook.presto.tests.utils.QueryExecutors.onPresto;
 import static io.prestodb.tempto.assertions.QueryAssert.Row.row;
@@ -53,7 +53,7 @@ public void testToDate()
     public void testToTimestamp()
     {
         assertThat(onPresto().executeQuery("SELECT to_timestamp('1988/04/08;02:03:04','yyyy/mm/dd;hh24:mi:ss')"))
-                .contains(row(parseTimestampInLocalTime("1988-04-08 02:03:04.0", DateTimeZone.forID("Asia/Kathmandu"))));
+                .contains(row(parseTimestampInLocalTime("1988-04-08 02:03:04.0", PRODUCT_TESTS_TIME_ZONE)));
     }
 
     @Test(groups = FUNCTIONS)