From b4de95941b1e7610183d84ca9754f250679dbeae Mon Sep 17 00:00:00 2001
From: Yang Jiao <jiaoya@vmware.com>
Date: Wed, 12 Jan 2022 07:40:21 +0000
Subject: [PATCH] Specify postgresql version to 13

Signed-off-by: Yang Jiao <jiaoya@vmware.com>
---
 make/photon/db/Dockerfile.pg96 | 7 ++++---
 tests/ci/api_run.sh            | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/make/photon/db/Dockerfile.pg96 b/make/photon/db/Dockerfile.pg96
index 5dbd0eb9e..00d65be39 100644
--- a/make/photon/db/Dockerfile.pg96
+++ b/make/photon/db/Dockerfile.pg96
@@ -7,7 +7,7 @@ COPY ./make/photon/db/postgresql96-9.6.21-1.ph4.x86_64.rpm /pg96/
 
 RUN tdnf install -y /pg96/postgresql96-libs-9.6.21-1.ph4.x86_64.rpm /pg96/postgresql96-9.6.21-1.ph4.x86_64.rpm >> /dev/null \
     && rm -rf /pg96 \
-    && tdnf install -y shadow gzip postgresql findutils bc >> /dev/null \
+    && tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \
     && groupadd -r postgres --gid=999 \
     && useradd -m -r -g postgres --uid=999 postgres \
     && mkdir -p /docker-entrypoint-initdb.d \
@@ -15,8 +15,9 @@ RUN tdnf install -y /pg96/postgresql96-libs-9.6.21-1.ph4.x86_64.rpm /pg96/postgr
     && chown -R postgres:postgres /run/postgresql \
     && chmod 2777 /run/postgresql \
     && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \
-    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/share/postgresql/postgresql.conf.sample \
-    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql.conf.sample \
+    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql.conf.sample \
+    && ln -s /usr/pgsql/13/bin/* /usr/bin/ \
     && tdnf clean all
 
 RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools
\ No newline at end of file
diff --git a/tests/ci/api_run.sh b/tests/ci/api_run.sh
index 24729d1b8..7ef7fce8f 100755
--- a/tests/ci/api_run.sh
+++ b/tests/ci/api_run.sh
@@ -21,7 +21,7 @@ set +e
 docker ps
 # run db auth api cases
 if [ "$1" = 'DB' ]; then
-    docker run -i --privileged -v $DIR/../../:/drone -v $DIR/../:/ca -w /drone $E2E_IMAGE robot --exclude proxy_cache --exclude content_trust --exclude sign_image -v DOCKER_USER:${DOCKER_USER} -v DOCKER_PWD:${DOCKER_PWD} -v ip:$2  -v ip1: -v http_get_ca:false -v HARBOR_PASSWORD:Harbor12345 /drone/tests/robot-cases/Group1-Nightly/Setup.robot /drone/tests/robot-cases/Group0-BAT/API_DB.robot
+    docker run -i --privileged -v $DIR/../../:/drone -v $DIR/../:/ca -w /drone $E2E_IMAGE robot --exclude proxy_cache -v DOCKER_USER:${DOCKER_USER} -v DOCKER_PWD:${DOCKER_PWD} -v ip:$2  -v ip1: -v http_get_ca:false -v HARBOR_PASSWORD:Harbor12345 /drone/tests/robot-cases/Group1-Nightly/Setup.robot /drone/tests/robot-cases/Group0-BAT/API_DB.robot
 elif [ "$1" = 'PROXY_CACHE' ]; then
     docker run -i --privileged -v $DIR/../../:/drone -v $DIR/../:/ca -w /drone $E2E_IMAGE robot --include setup  --include proxy_cache -v DOCKER_USER:${DOCKER_USER} -v DOCKER_PWD:${DOCKER_PWD} -v ip:$2  -v ip1: -v http_get_ca:false -v HARBOR_PASSWORD:Harbor12345 /drone/tests/robot-cases/Group1-Nightly/Setup.robot /drone/tests/robot-cases/Group0-BAT/API_DB.robot
 elif [ "$1" = 'LDAP' ]; then