This is an automated email from the ASF dual-hosted git repository.

okislal pushed a commit to branch madlib2-master
in repository https://gitbox.apache.org/repos/asf/madlib.git

commit 845bcb5c8e6f0a71b609e50905683bd4d84ed70c
Author: Orhan Kislal <[email protected]>
AuthorDate: Thu Aug 31 13:09:12 2023 +0300

    Build: Use PG15 in jenkins build
---
 tool/jenkins/jenkins_build.sh | 59 ++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/tool/jenkins/jenkins_build.sh b/tool/jenkins/jenkins_build.sh
index 72fb66ea..1a77b697 100755
--- a/tool/jenkins/jenkins_build.sh
+++ b/tool/jenkins/jenkins_build.sh
@@ -20,7 +20,7 @@
 workdir=`pwd`
 user_name=`whoami`
 
-# FIXME: Jenkins build is not working, even though PG13 compiles on local Mac.
+# FIXME: Jenkins build is not working, even though PG15 compiles on local Mac.
 # Need to find an efficient way to debug since it has a server crash.
 
 echo "======================================================================"
@@ -30,8 +30,8 @@ echo 
"----------------------------------------------------------------------"
 echo "ls -la"
 ls -la
 echo "-------------------------------"
-echo "rm -rf build"
-rm -rf build
+echo "rm -rf build_jenkins"
+rm -rf build_jenkins
 echo "-------------------------------"
 echo "rm -rf logs"
 rm -rf logs
@@ -46,14 +46,14 @@ docker rm madlib
 
 echo "Creating docker container"
 # Pull down the base docker images
-echo "docker pull madlib/postgres_13:jenkins"
-docker pull madlib/postgres_13:jenkins
+echo "docker pull madlib/postgres_15:jenkins"
+docker pull madlib/postgres_15:jenkins
 # Launch docker container with volume mounted from workdir
 echo "-------------------------------"
 cat <<EOF
-docker run -d -t -e POSTGRES_PASSWORD=postgres --name madlib --ulimit core=-1  
--privileged -v "${workdir}":/madlib madlib/postgres_13:jenkins | tee 
logs/docker_setup.log
+docker run -d -t -e POSTGRES_PASSWORD=postgres --name madlib --ulimit core=-1  
--privileged -v "${workdir}":/madlib madlib/postgres_15:jenkins | tee 
logs/docker_setup.log
 EOF
-docker run -d -t -e POSTGRES_PASSWORD=postgres --name madlib --ulimit core=-1  
--privileged -v "${workdir}":/madlib madlib/postgres_13:jenkins | tee 
logs/docker_setup.log
+docker run -d -t -e POSTGRES_PASSWORD=postgres --name madlib --ulimit core=-1  
--privileged -v "${workdir}":/madlib madlib/postgres_15:jenkins | tee 
logs/docker_setup.log
 echo "-------------------------------"
 
 ## This sleep is required since it takes a couple of seconds for the docker
@@ -61,9 +61,9 @@ echo "-------------------------------"
 sleep 5
 
 cat <<EOF
-docker exec madlib bash -c 'cp /madlib/tool/pg_hba.conf.postgres 
/var/lib/postgresql/data/pg_hba.conf; echo "    * soft nproc unlimited" > 
/etc/security/limits.d/postgres-limits.conf ' | tee 
$workdir/logs/madlib_compile.log
+docker exec madlib bash -c 'cp /madlib/tool/pg_hba.conf.postgres 
/etc/postgresql/15/main/pg_hba.conf; echo "    * soft nproc unlimited" > 
/etc/security/limits.d/postgres-limits.conf ' | tee 
$workdir/logs/madlib_compile.log
 EOF
-docker exec madlib bash -c 'cp /madlib/tool/pg_hba.conf.postgres 
/var/lib/postgresql/data/pg_hba.conf; echo "    * soft nproc unlimited" > 
/etc/security/limits.d/postgres-limits.conf ' | tee 
$workdir/logs/madlib_compile.log
+docker exec madlib bash -c 'cp /madlib/tool/pg_hba.conf.postgres 
/etc/postgresql/15/main/pg_hba.conf; echo "    * soft nproc unlimited" > 
/etc/security/limits.d/postgres-limits.conf ' | tee 
$workdir/logs/madlib_compile.log
 
 cat <<EOF
 docker exec madlib bash -c 'service postgresql start' | tee 
$workdir/logs/madlib_compile.log
@@ -80,41 +80,42 @@ docker exec madlib bash -c 'apt-get update; apt-get install 
-y python3-pip; pip
 echo "---------- Building package -----------"
 # cmake, make, make install, and make package
 cat <<EOF
-docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake 
../madlib; make clean; make -j$(nproc); make -j$(nproc); make install; make 
package; chown -R postgres:postgres /build ' | tee 
$workdir/logs/madlib_compile.log
+docker exec madlib bash -c 'rm -rf /build_jenkins; mkdir /build_jenkins; cd 
/build_jenkins; cmake ../madlib; make clean; make -j$(nproc); make -j$(nproc); 
make install; make package; chown -R postgres:postgres /build_jenkins ' | tee 
$workdir/logs/madlib_compile.log
 EOF
-docker exec madlib bash -c 'rm -rf /build; mkdir /build; cd /build; cmake 
../madlib; make clean; make -j$(nproc); make -j$(nproc); make install; make 
package; chown -R postgres:postgres /build ' | tee 
$workdir/logs/madlib_compile.log
+docker exec madlib bash -c 'rm -rf /build_jenkins; mkdir /build_jenkins; cd 
/build_jenkins; cmake ../madlib; make clean; make -j$(nproc); make -j$(nproc); 
make install; make package; chown -R postgres:postgres /build_jenkins ' | tee 
$workdir/logs/madlib_compile.log
 
 echo "---------- Installing and running dev-check --------------------"
 # Install MADlib and run dev check
+
 cat <<EOF
-docker exec -u postgres madlib bash -c 'export 
PATH=$PATH:/usr/lib/postgresql/13/bin/; /build/src/bin/madpack -s mad -p 
postgres -c postgres/postgres@localhost:5432/postgres install' | tee 
$workdir/logs/madlib_install.log
+docker exec -u postgres madlib bash -c 'export 
PATH=\$PATH:/usr/lib/postgresql/15/bin/; /build_jenkins/src/bin/madpack -s mad 
-p postgres -c postgres/postgres@localhost:5432/postgres install' | tee 
$workdir/logs/madlib_install.log
 EOF
-docker exec -u postgres madlib bash -c 'export 
PATH=$PATH:/usr/lib/postgresql/13/bin/; /build/src/bin/madpack -s mad -p 
postgres -c postgres/postgres@localhost:5432/postgres install' | tee 
$workdir/logs/madlib_install.log
+docker exec -u postgres madlib bash -c 'export 
PATH=$PATH:/usr/lib/postgresql/15/bin/; /build_jenkins/src/bin/madpack -s mad 
-p postgres -c postgres/postgres@localhost:5432/postgres install' | tee 
$workdir/logs/madlib_install.log
 
 cat <<EOF
 docker exec madlib bash -c 'mkdir -p /tmp'
-docker exec madlib bash -c '/build/src/bin/madpack -s mad -p postgres  -c 
postgres/postgres@localhost:5432/postgres -d /tmp dev-check' | tee 
$workdir/logs/madlib_dev_check.log
-docker exec madlib bash -c '/build/src/bin/madpack -s mad -p postgres  -c 
postgres/postgres@localhost:5432/postgres -d /tmp unit-test' | tee -a 
$workdir/logs/madlib_dev_check.log
+docker exec madlib bash -c '/build_jenkins/src/bin/madpack -s mad -p postgres  
-c postgres/postgres@localhost:5432/postgres -d /tmp dev-check' | tee 
$workdir/logs/madlib_dev_check.log
+docker exec madlib bash -c '/build_jenkins/src/bin/madpack -s mad -p postgres  
-c postgres/postgres@localhost:5432/postgres -d /tmp unit-test' | tee -a 
$workdir/logs/madlib_dev_check.log
 EOF
 
 docker exec madlib bash -c 'mkdir -p /tmp'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/deep_learning/test'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/13/modules/deep_learning/test'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/deep_learning/test'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/15/modules/deep_learning/test'
 # FIXME following tests fail on the docker
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/linalg/test/linalg.sql_in'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/prob/test/prob.sql_in'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/utilities/test/path.sql_in'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/mxgboost/test/madlib_xgboost.sql_in'
-docker exec madlib bash -c 'rm -rf 
/build/src/ports/postgres/modules/kmeans/test/kmeans.sql_in'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/linalg/test/linalg.sql_in'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/prob/test/prob.sql_in'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/stats/test/cox_prop_hazards.sql_in'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/utilities/test/path.sql_in'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/mxgboost/test/madlib_xgboost.sql_in'
+docker exec madlib bash -c 'rm -rf 
/build_jenkins/src/ports/postgres/modules/kmeans/test/kmeans.sql_in'
 # Run dev check
-docker exec madlib bash -c '/build/src/bin/madpack -s mad -p postgres  -c 
postgres/postgres@localhost:5432/postgres -d /tmp dev-check' | tee 
$workdir/logs/madlib_dev_check.log
+docker exec madlib bash -c '/build_jenkins/src/bin/madpack -s mad -p postgres  
-c postgres/postgres@localhost:5432/postgres -d /tmp dev-check' | tee 
$workdir/logs/madlib_dev_check.log
 # Run unit tests, and append output to dev_check's log file
-docker exec madlib bash -c '/build/src/bin/madpack -s mad -p postgres  -c 
postgres/postgres@localhost:5432/postgres -d /tmp unit-test' | tee -a 
$workdir/logs/madlib_dev_check.log
+docker exec madlib bash -c '/build_jenkins/src/bin/madpack -s mad -p postgres  
-c postgres/postgres@localhost:5432/postgres -d /tmp unit-test' | tee -a 
$workdir/logs/madlib_dev_check.log
 
 echo "--------- Copying packages -----------------"
-echo "docker cp madlib:build $workdir"
-docker cp madlib:build $workdir
+echo "docker cp madlib:build_jenkins $workdir"
+docker cp madlib:build_jenkins $workdir
 echo "docker cp madlib:tmp $workdir"
 docker cp madlib:tmp $workdir
 
@@ -122,8 +123,8 @@ echo "-------------------------------"
 echo "ls -la"
 ls -la
 echo "-------------------------------"
-echo "ls -la build"
-ls -la build/
+echo "ls -la build_jenkins"
+ls -la build_jenkins/
 echo "-------------------------------"
 
 # convert dev-check test results to junit format for reporting

Reply via email to