From cc4642600d280ce8337e382a077d5a6a3a7ef070 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 28 May 2024 14:58:33 -0700 Subject: [PATCH] ci config --- ci/ci.sh | 27 ++++++++++++++------------- ci/run_ci.sh | 3 ++- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ci/ci.sh b/ci/ci.sh index 083e11e2..858e5f5d 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -12,20 +12,21 @@ DB_PASS=${8} ES_PROTOCOL=${9} ES_HOST=${10} -ES_PORT=${11} -ES_USE_AUTH=${12} -ES_USERNAME=${13} -ES_PASSWORD=${14} +ES_INDEX_NAME=${11} +ES_PORT=${12} +ES_USE_AUTH=${13} +ES_USERNAME=${14} +ES_PASSWORD=${15} -CLOUD=${15} -SECURITY=${16} -HOSTNAME=${17} -EMAIL_LIST=${18} -ADMIN_FIRST=${19} -ADMIN_LAST=${20} -ADMIN_EMAIL=${21} -NUM_WORKERS=${22} -WORKER_ABANDONED_DAYS=${23} +CLOUD=${16} +SECURITY=${17} +HOSTNAME=${18} +EMAIL_LIST=${19} +ADMIN_FIRST=${20} +ADMIN_LAST=${21} +ADMIN_EMAIL=${22} +NUM_WORKERS=${23} +WORKER_ABANDONED_DAYS=${24} source ${ROOT}/../utils.sh diff --git a/ci/run_ci.sh b/ci/run_ci.sh index 7474bfac..90af0d8d 100755 --- a/ci/run_ci.sh +++ b/ci/run_ci.sh @@ -31,6 +31,7 @@ ADMIN_EMAIL="/" ES_PROTOCOL="HTTP" ES_HOST="http://localhost" +ES_INDEX_NAME="cws" ES_PORT=9200 ES_USE_AUTH=n ES_USERNAME="na" @@ -44,4 +45,4 @@ NUM_WORKERS=${2} # parameter is passed as an env through workflow file WORKER_ABANDONED_DAYS=1 # Run the ci script -./ci.sh `pwd` ${USER} ${DB_TYPE} ${DB_HOST} ${DB_PORT} ${DB_NAME} ${DB_USER} ${DB_PASS} ${ES_PROTOCOL} ${ES_HOST} ${ES_PORT} ${ES_USE_AUTH} ${ES_USERNAME} ${ES_PASSWORD} ${CLOUD} ${SECURITY} ${HOSTNAME} ${EMAIL_LIST} ${ADMIN_FIRST} ${ADMIN_LAST} ${ADMIN_EMAIL} ${NUM_WORKERS} ${WORKER_ABANDONED_DAYS} +./ci.sh `pwd` ${USER} ${DB_TYPE} ${DB_HOST} ${DB_PORT} ${DB_NAME} ${DB_USER} ${DB_PASS} ${ES_PROTOCOL} ${ES_HOST} ${ES_INDEX_NAME} ${ES_PORT} ${ES_USE_AUTH} ${ES_USERNAME} ${ES_PASSWORD} ${CLOUD} ${SECURITY} ${HOSTNAME} ${EMAIL_LIST} ${ADMIN_FIRST} ${ADMIN_LAST} ${ADMIN_EMAIL} ${NUM_WORKERS} ${WORKER_ABANDONED_DAYS}