This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 04ed23c [Issue 6274][Test] Fixed integration Pulsar SQL test failed
(#6279)
04ed23c is described below
commit 04ed23c019eec7e15dccc780bf6ee8e2e987cb24
Author: Guangning <[email protected]>
AuthorDate: Mon Feb 10 07:00:58 2020 +0800
[Issue 6274][Test] Fixed integration Pulsar SQL test failed (#6279)
* Delete no use docker image
* Add get docker images for delete docker images
* Add command for get space size
* Add delete docker images
* Fixed error
* Upgrade postgresql from version 9.6 to 11
* Delete no used image first
* Fixed delete image
* Fixed docker images order
* Add maven install step
* Add option docker.nocache=true
* Fixed correct docker image
* Fixed integration test failed
* Delete debug info
---
.github/workflows/ci-integration-sql.yaml | 22 ++++++++++------------
dashboard/Dockerfile | 2 +-
dashboard/conf/postgresql.conf | 8 ++++----
dashboard/init-postgres.sh | 2 +-
docker/pulsar-standalone/Dockerfile | 4 ++--
5 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/ci-integration-sql.yaml
b/.github/workflows/ci-integration-sql.yaml
index 8965dcd..c495eb7 100644
--- a/.github/workflows/ci-integration-sql.yaml
+++ b/.github/workflows/ci-integration-sql.yaml
@@ -46,27 +46,25 @@ jobs:
with:
java-version: 1.8
- - name: Set up Maven
- uses: aahmed-se/setup-maven@v3
+ - name: remove docker node image
if: steps.docs.outputs.changed_only == 'no'
- with:
- maven-version: 3.6.1
+ run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f
buildpack-deps:stretch
- - name: build artifacts and docker image
+ - name: remove docker builder and microsoft image
if: steps.docs.outputs.changed_only == 'no'
- run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR
-Pdocker -DskipTests
+ run: docker rmi -f jekyll/builder:latest && docker rmi -f
mcr.microsoft.com/azure-pipelines/node8-typescript:latest
- - name: clean docker container
+ - name: run install by skip tests
if: steps.docs.outputs.changed_only == 'no'
- run: docker system prune -f
+ run: mvn clean install -DskipTests
- - name: remove docker node image
+ - name: build artifacts and docker pulsar latest test image
if: steps.docs.outputs.changed_only == 'no'
- run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f
buildpack-deps:stretch
+ run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker
-DskipTests
- - name: remove docker builder and microsoft image
+ - name: clean docker container
if: steps.docs.outputs.changed_only == 'no'
- run: docker rmi -f jekyll/builder:latest && docker rmi -f
mcr.microsoft.com/azure-pipelines/node8-typescript:latest
+ run: docker system prune -f
- name: run integration tests
if: steps.docs.outputs.changed_only == 'no'
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index b9fa47c..7388481 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update
RUN apt-get -y install postgresql python sudo nginx supervisor
# Postgres configuration
-COPY conf/postgresql.conf /etc/postgresql/9.6/main/
+COPY conf/postgresql.conf /etc/postgresql/11/main/
# Configure nginx and supervisor
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
diff --git a/dashboard/conf/postgresql.conf b/dashboard/conf/postgresql.conf
index aabad0d..85dfe1b 100644
--- a/dashboard/conf/postgresql.conf
+++ b/dashboard/conf/postgresql.conf
@@ -24,15 +24,15 @@ synchronous_commit = off
# Default configs
data_directory = '/data'
-hba_file = '/etc/postgresql/9.6/main/pg_hba.conf'
-ident_file = '/etc/postgresql/9.6/main/pg_ident.conf'
-external_pid_file = '/var/run/postgresql/9.6-main.pid'
+hba_file = '/etc/postgresql/11/main/pg_hba.conf'
+ident_file = '/etc/postgresql/11/main/pg_ident.conf'
+external_pid_file = '/var/run/postgresql/11-main.pid'
port = 5432
max_connections = 100
datestyle = 'iso, mdy'
default_text_search_config = 'pg_catalog.english'
-stats_temp_directory = '/var/run/postgresql/9.6-main.pg_stat_tmp'
+stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp'
timezone = 'UTC'
log_timezone = 'UTC'
diff --git a/dashboard/init-postgres.sh b/dashboard/init-postgres.sh
index 064b7e3..5f4c627 100755
--- a/dashboard/init-postgres.sh
+++ b/dashboard/init-postgres.sh
@@ -23,7 +23,7 @@ set -x -e
rm -rf /data/*
chown -R postgres: /data
chmod 700 /data
-sudo -u postgres /usr/lib/postgresql/9.6/bin/initdb /data/
+sudo -u postgres /usr/lib/postgresql/11/bin/initdb /data/
sudo -u postgres /etc/init.d/postgresql start
sudo -u postgres psql --command "CREATE USER docker WITH PASSWORD 'docker';"
sudo -u postgres createdb -O docker pulsar_dashboard
diff --git a/docker/pulsar-standalone/Dockerfile
b/docker/pulsar-standalone/Dockerfile
index 076d356..092e5cf 100644
--- a/docker/pulsar-standalone/Dockerfile
+++ b/docker/pulsar-standalone/Dockerfile
@@ -37,13 +37,13 @@ COPY --from=dashboard /pulsar/conf/* /pulsar/conf/
# Note that the libpq-dev package is needed here in order to install
# the required python psycopg2 package (for postgresql) later
RUN apt-get update
-RUN apt-get -y install python2.7 python-pip postgresql-9.6 sudo nginx
supervisor libpq-dev
+RUN apt-get -y install python2.7 python-pip postgresql sudo nginx supervisor
libpq-dev
# Python dependencies
RUN pip2 install -r /pulsar/django/requirements.txt
# Postgres configuration
-COPY --from=dashboard /etc/postgresql/9.6/main/postgresql.conf
/etc/postgresql/9.6/main/postgresql.conf
+COPY --from=dashboard /etc/postgresql/11/main/postgresql.conf
/etc/postgresql/11/main/postgresql.conf
# Configure supervisor
COPY --from=dashboard /etc/supervisor/conf.d/supervisor-app.conf
/etc/supervisor/conf.d/supervisor-app.conf
