Skip to content

Commit 30a074c

Browse files
committed
Revert: Do not start Hive for FTP integration tests
1 parent 6db3916 commit 30a074c

File tree

6 files changed

+22
-3
lines changed

6 files changed

+22
-3
lines changed

.env.docker.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ TEST_WEBDAV_USER=syncmaster
105105
TEST_WEBDAV_PASSWORD=123UsedForTestOnly@!
106106

107107
SPARK_CONF_DIR=/app/tests/spark/hive/conf/
108+
HADOOP_CONF_DIR=/app/tests/spark/hadoop/
108109
HIVE_CONF_DIR=/app/tests/spark/hive/conf/

.env.local.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ export TEST_WEBDAV_USER=syncmaster
105105
export TEST_WEBDAV_PASSWORD=123UsedForTestOnly@!
106106

107107
export SPARK_CONF_DIR=./tests/spark/hive/conf/
108+
export HADOOP_CONF_DIR=./tests/spark/hadoop/
108109
export HIVE_CONF_DIR=./tests/spark/hive/conf/

.github/workflows/ftp-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Start FTP
1818
run: |
1919
docker compose -f docker-compose.test.yml --profile all down -v --remove-orphans
20-
docker compose -f docker-compose.test.yml --profile ftp up -d db rabbitmq horizon test-ftp
20+
docker compose -f docker-compose.test.yml --profile ftp up -d db rabbitmq horizon test-ftp test-hive
2121
2222
- name: Set up QEMU
2323
uses: docker/setup-qemu-action@v3

.github/workflows/s3-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Start S3
1818
run: |
1919
docker compose -f docker-compose.test.yml --profile all down -v --remove-orphans
20-
docker compose -f docker-compose.test.yml --profile s3 up -d db rabbitmq horizon test-s3
20+
docker compose -f docker-compose.test.yml --profile s3 up -d db rabbitmq horizon test-s3 test-hive
2121
2222
- name: Set up QEMU
2323
uses: docker/setup-qemu-action@v3

docker-compose.test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ services:
335335
HIVE_METASTORE_DB_DRIVER: org.postgresql.Driver
336336
HIVE_METASTORE_DB_USER: test_hive
337337
HIVE_METASTORE_DB_PASSWORD: test_hive
338-
profiles: [hive, hdfs, all]
338+
# writing spark dataframe to xml file fails if fs.defaultFS is not accessible
339+
profiles: [hive, hdfs, s3, ftp, all]
339340

340341
test-sftp:
341342
image: ${SFTP_IMAGE:-linuxserver/openssh-server}

tests/spark/hadoop/core-site.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3+
<configuration>
4+
<property>
5+
<name>fs.defaultFS</name>
6+
<value>hdfs://test-hive:9820</value>
7+
</property>
8+
<property>
9+
<name>hadoop.proxyuser.root.hosts</name>
10+
<value>*</value>
11+
</property>
12+
<property>
13+
<name>hadoop.proxyuser.root.groups</name>
14+
<value>*</value>
15+
</property>
16+
</configuration>

0 commit comments

Comments
 (0)