Update CI, use new Docker imange

concourse/pipeline/main.ent.yml

@@ -30,10 +30,10 @@ resources:
     uri: git@github.com:eloqdata/raft_host_manager.git
     private_key: ((git-key))
 
-- name: mono_ubuntu_2204
+- name: eloq_ubuntu_2404
   type: registry-image
   source:
-    repository: monographdb/monograph-dev-ci-ubuntu2204
+    repository: eloqdata/monograph-dev-ci-ubuntu2404
     username: monographdb
     password: ((docker-secret-key))
 
@@ -53,9 +53,9 @@ jobs:
         trigger: true
       - get: eloq_test_src
         trigger: true
-      - get: mono_ubuntu_2204
+      - get: eloq_ubuntu_2404
   - task: compile-test-task
-    image: mono_ubuntu_2204
+    image: eloq_ubuntu_2404
     file: eloqsql_src/concourse/tasks/main.ent.yml
     params:
       ELOQ_AWS_ACCESS_KEY_ID: ((minio-access-key))

concourse/pipeline/main.yml

@@ -14,10 +14,10 @@ resources:
     uri: git@github.com:eloqdata/eloq-test.git
     private_key: ((git-key))
 
-- name: mono_ubuntu_2204
+- name: eloq_ubuntu_2404
   type: registry-image
   source:
-    repository: monographdb/monograph-dev-ci-ubuntu2204
+    repository: eloqdata/monograph-dev-ci-ubuntu2404
     username: monographdb
     password: ((docker_hub_pass))
 
@@ -33,9 +33,9 @@ jobs:
         trigger: true
       - get: eloq_test_src
         trigger: true
-      - get: mono_ubuntu_2204
+      - get: eloq_ubuntu_2404
   - task: compile-test-task
-    image: mono_ubuntu_2204
+    image: eloq_ubuntu_2404
     file: eloqsql_src/concourse/tasks/main.yml
     params:
       ELOQ_AWS_ACCESS_KEY_ID: ((minio-access-key))

concourse/pipeline/pr.ent.yml

@@ -37,10 +37,10 @@ resources:
     uri: git@github.com:eloqdata/raft_host_manager.git
     private_key: ((git-key))
 
-- name: mono_ubuntu_2004
+- name: eloq_ubuntu_2404
   type: registry-image
   source:
-    repository: monographdb/monograph-dev-ci-ubuntu2004
+    repository: eloqdata/monograph-dev-ci-ubuntu2404
     username: monographdb
     password: ((docker-secret-key))
 
@@ -58,13 +58,13 @@ jobs:
       - get: eloqsql_pr
         trigger: true
         version: every
-      - get: mono_ubuntu_2004
+      - get: eloq_ubuntu_2404
   - put: eloqsql_pr
     params:
       path: eloqsql_pr
       status: pending
   - task: compile-test-task
-    image: mono_ubuntu_2004
+    image: eloq_ubuntu_2404
     file: eloqsql_pr/concourse/tasks/pr.ent.yml
     params:
       ELOQ_AWS_ACCESS_KEY_ID: ((minio-access-key))

concourse/scripts/main.bash

@@ -10,7 +10,8 @@ cd $WORKSPACE
 whoami
 pwd
 ls
-sudo chown -R mono $PWD
+current_user=$(whoami)
+sudo chown -R $current_user $PWD
 
 # make coredump dir writable.
 if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi
@@ -19,12 +20,12 @@ sudo chmod 777 /var/crash
 ulimit -c unlimited
 echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern
 
-sudo chown -R mono /home/mono/workspace
-cd /home/mono/workspace
+sudo chown -R $current_user /home/$current_user/workspace
+cd /home/$current_user/workspace
 ln -s $WORKSPACE/eloqsql_src eloqsql
 ln -s $WORKSPACE/eloq_test_src eloq_test
 
-cd /home/mono/workspace/eloqsql
+cd /home/$current_user/workspace/eloqsql
 git submodule sync
 git submodule update --init --recursive
 
@@ -117,14 +118,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g"
 echo "dss_server.ini"
 cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
 
-cd /home/mono/workspace/eloqsql
+cd /home/$current_user/workspace/eloqsql
 
 echo "configuring"
 if [ ! -d "bld" ]; then mkdir bld; fi
 cd bld
 
 if [ ! -f "Makefile" ]; then
-    cmake -DCMAKE_INSTALL_PREFIX="/home/mono/workspace/eloqsql/install" \
+    cmake -DCMAKE_INSTALL_PREFIX="/home/$current_user/workspace/eloqsql/install" \
           -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \
           -DCMAKE_BUILD_TYPE=Debug \
           -DINSTALL_MYSQLTESTDIR="" \
@@ -152,24 +153,24 @@ echo "installing"
 cmake --install . --config Debug
 
 echo "building dss_server"
-cd /home/mono/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service
+cd /home/$current_user/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service
 mkdir bld && cd bld
 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
 cmake --build . --config Debug -j8
 echo "installing dss_server"
-cp dss_server /home/mono/workspace/eloqsql/install/bin/
+cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
 
 echo "building log_server"
-cd /home/mono/workspace/eloqsql/storage/eloq/log_service
+cd /home/$current_user/workspace/eloqsql/storage/eloq/log_service
 mkdir bld && cd bld
 cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON ../
 cmake --build . --config Debug -j8
 echo "installing launch_sv"
-cp launch_sv /home/mono/workspace/eloqsql/install/bin/
+cp launch_sv /home/$current_user/workspace/eloqsql/install/bin/
 
 echo "build finished"
 
-cd /home/mono/workspace/eloq_test
+cd /home/$current_user/workspace/eloq_test
 ./setup
 sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf
 sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf
@@ -199,9 +200,9 @@ mc rb minio_server/txlog-${bucket_name} --force
 set -e
 
 echo "running eloq_test"
-# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/mono/workspace/eloqsql/install 
+# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$current_user/workspace/eloqsql/install
 
-cd /home/mono/workspace/eloqsql/bld/mysql-test
+cd /home/$current_user/workspace/eloqsql/bld/mysql-test
 
 # Clean up minio buckets
 echo "cleaning minio buckets"
@@ -233,7 +234,7 @@ cat $WORKSPACE/eloqsql_src/mysql-test/include/eloq_kv_dss.cnf
 
 # Start dss_server
 echo "starting dss_server"
-nohup /home/mono/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
+nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
 sleep 5
 
 echo "running mono_multi"

concourse/scripts/main.ent.bash

@@ -10,7 +10,8 @@ cd $WORKSPACE
 whoami
 pwd
 ls
-sudo chown -R mono $PWD
+current_user=$(whoami)
+sudo chown -R $current_user $PWD
 
 # make coredump dir writable.
 if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi
@@ -19,16 +20,16 @@ sudo chmod 777 /var/crash
 ulimit -c unlimited
 echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern
 
-sudo chown -R mono /home/mono/workspace
-cd /home/mono/workspace
+sudo chown -R $current_user /home/$current_user/workspace
+cd /home/$current_user/workspace
 ln -s $WORKSPACE/eloqsql_src eloqsql
 ln -s $WORKSPACE/eloq_test_src eloq_test
 
-cd /home/mono/workspace/eloqsql
+cd /home/$current_user/workspace/eloqsql
 git submodule sync
 git submodule update --init --recursive
 
-cd /home/mono/workspace/eloqsql/storage/eloq
+cd /home/$current_user/workspace/eloqsql/storage/eloq
 ln -s $WORKSPACE/logservice_src eloq_log_service
 cd tx_service
 ln -s $WORKSPACE/raft_host_manager_src raft_host_manager
@@ -125,14 +126,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g"
 echo "dss_server.ini"
 cat $WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini
 
-cd /home/mono/workspace/eloqsql
+cd /home/$current_user/workspace/eloqsql
 
 echo "configuring"
 if [ ! -d "bld" ]; then mkdir bld; fi
 cd bld
 
 if [ ! -f "Makefile" ]; then
-    cmake -DCMAKE_INSTALL_PREFIX="/home/mono/workspace/eloqsql/install" \
+    cmake -DCMAKE_INSTALL_PREFIX="/home/$current_user/workspace/eloqsql/install" \
           -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \
           -DCMAKE_BUILD_TYPE=Debug \
           -DINSTALL_MYSQLTESTDIR="" \
@@ -163,24 +164,24 @@ echo "installing"
 cmake --install . --config Debug
 
 echo "building dss_server"
-cd /home/mono/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service
+cd /home/$current_user/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service
 mkdir bld && cd bld
 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
 cmake --build . --config Debug -j8
 echo "installing dss_server"
-cp dss_server /home/mono/workspace/eloqsql/install/bin/
+cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
 
 echo "building log_server"
-cd /home/mono/workspace/eloqsql/storage/eloq/log_service
+cd /home/$current_user/workspace/eloqsql/storage/eloq/log_service
 mkdir bld && cd bld
 cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON ../
 cmake --build . --config Debug -j8
 echo "installing launch_sv"
-cp launch_sv /home/mono/workspace/eloqsql/install/bin/
+cp launch_sv /home/$current_user/workspace/eloqsql/install/bin/
 
 echo "build finished"
 
-cd /home/mono/workspace/eloq_test
+cd /home/$current_user/workspace/eloq_test
 ./setup
 sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf
 sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf
@@ -210,9 +211,9 @@ mc rb ${minio_server_alias}/txlog-${bucket_name} --force
 set -e
 
 echo "running eloq_test"
-# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/mono/workspace/eloqsql/install 
+# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$current_user/workspace/eloqsql/install
 
-cd /home/mono/workspace/eloqsql/bld/mysql-test
+cd /home/$current_user/workspace/eloqsql/bld/mysql-test
 
 # Clean up minio buckets
 echo "cleaning minio buckets"
@@ -244,7 +245,7 @@ cat $WORKSPACE/eloqsql_src/mysql-test/include/eloq_kv_dss.cnf
 
 # Start dss_server
 echo "starting dss_server"
-nohup /home/mono/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
+nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_src/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
 sleep 5
 
 echo "running mono_multi"

concourse/scripts/my.cnf

@@ -1,7 +1,7 @@
 [mariadb]
 plugin_maturity=experimental
-datadir=/home/mono/mariadbdata0
-lc_messages_dir=/home/mono/workspace/mariadb/sql/share
+datadir=/home/eloq/mariadbdata0
+lc_messages_dir=/home/eloq/workspace/mariadb/sql/share
 max_connections=500
 skip-log-bin
 innodb_flush_method=fsync

concourse/scripts/pr.ent.bash

@@ -9,7 +9,8 @@ cd $WORKSPACE
 whoami
 pwd
 ls
-sudo chown -R mono $PWD
+current_user=$(whoami)
+sudo chown -R $current_user $PWD
 
 # make coredump dir writable.
 if [ ! -d "/var/crash" ]; then sudo mkdir -p /var/crash; fi
@@ -18,17 +19,17 @@ sudo chmod 777 /var/crash
 ulimit -c unlimited
 echo '/var/crash/core.%t.%e.%p' | sudo tee /proc/sys/kernel/core_pattern
 
-sudo chown -R mono /home/mono/workspace
-cd /home/mono/workspace
+sudo chown -R $current_user /home/$current_user/workspace
+cd /home/$current_user/workspace
 ln -s $WORKSPACE/eloqsql_pr eloqsql
 ln -s $WORKSPACE/eloq_test_src eloq_test
 
-cd /home/mono/workspace/eloqsql
+cd /home/$current_user/workspace/eloqsql
 git submodule sync
 git submodule update --init --recursive
 pr_branch_name=$(cat .git/resource/metadata.json | jq -r '.[] | select(.name=="head_name") | .value')
 
-cd /home/mono/workspace/eloqsql/storage/eloq
+cd /home/$current_user/workspace/eloqsql/storage/eloq
 ln -s $WORKSPACE/logservice_src eloq_log_service
 
 cd eloq_log_service
@@ -134,14 +135,14 @@ sed -i "s/rocksdb_cloud_bucket_prefix.*=.\+/rocksdb_cloud_bucket_prefix=dss-/g"
 echo "dss_server.ini"
 cat $WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini
 
-cd /home/mono/workspace/eloqsql
+cd /home/$current_user/workspace/eloqsql
 
 echo "configuring"
 if [ ! -d "bld" ]; then mkdir bld; fi
 cd bld
 
 if [ ! -f "Makefile" ]; then
-    cmake -DCMAKE_INSTALL_PREFIX="/home/mono/workspace/eloqsql/install" \
+    cmake -DCMAKE_INSTALL_PREFIX="/home/$current_user/workspace/eloqsql/install" \
           -DPLUGIN_{HANDLERSOCKET,ROCKSDB,ARIA,ARCHIVE,CVS,FEDERATEDX,TOKUDB,MROONGA,OQGRAPH,CONNECT,SPIDER,SPHINX,HEAP,MYISAMMRG}=NO \
           -DCMAKE_BUILD_TYPE=Debug \
           -DINSTALL_MYSQLTESTDIR="" \
@@ -172,24 +173,24 @@ echo "installing"
 cmake --install . --config Debug
 
 echo "building dss_server"
-cd /home/mono/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service
+cd /home/$current_user/workspace/eloqsql/storage/eloq/store_handler/eloq_data_store_service
 mkdir bld && cd bld
 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_DATA_STORE=ELOQDSS_ROCKSDB_CLOUD_S3 ../
 cmake --build . --config Debug -j8
 echo "installing dss_server"
-cp dss_server /home/mono/workspace/eloqsql/install/bin/
+cp dss_server /home/$current_user/workspace/eloqsql/install/bin/
 
 echo "building log_server"
-cd /home/mono/workspace/eloqsql/storage/eloq/eloq_log_service
+cd /home/$current_user/workspace/eloqsql/storage/eloq/eloq_log_service
 mkdir bld && cd bld
 cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DUSE_ROCKSDB_LOG_STATE=ON -DWITH_ROCKSDB_CLOUD=S3 ../
 cmake --build . --config Debug -j8
 echo "installing launch_sv"
-cp launch_sv /home/mono/workspace/eloqsql/install/bin/
+cp launch_sv /home/$current_user/workspace/eloqsql/install/bin/
 
 echo "build finished"
 
-cd /home/mono/workspace/eloq_test
+cd /home/$current_user/workspace/eloq_test
 ./setup
 sed -i "s/eloq_aws_access_key_id.*=.\+/eloq_aws_access_key_id=${ELOQ_AWS_ACCESS_KEY_ID}/g" ./bootstrap_cnf/*_s3.cnf
 sed -i "s/eloq_aws_secret_key.*=.\+/eloq_aws_secret_key=${ELOQ_AWS_SECRET_KEY}/g" ./bootstrap_cnf/*_s3.cnf
@@ -219,9 +220,9 @@ mc rb ${minio_server_alias}/txlog-${bucket_name} --force
 set -e
 
 echo "running eloq_test"
-# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/mono/workspace/eloqsql/install 
+# python run_tests.py --dbtype eloqsql --storage eloqdss-rocksdb-cloud-s3 --install_path /home/$current_user/workspace/eloqsql/install
 
-cd /home/mono/workspace/eloqsql/bld/mysql-test
+cd /home/$current_user/workspace/eloqsql/bld/mysql-test
 
 # Clean up minio buckets
 echo "cleaning minio buckets"
@@ -253,7 +254,7 @@ cat $WORKSPACE/eloqsql_pr/mysql-test/include/eloq_kv_dss.cnf
 
 # Start dss_server
 echo "starting dss_server"
-nohup /home/mono/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
+nohup /home/$current_user/workspace/eloqsql/install/bin/dss_server --config=$WORKSPACE/eloqsql_pr/concourse/scripts/dss_server.ini > dss_server.log 2>&1 &
 sleep 5
 
 echo "running mono_multi"