From f92f36cb24482ee0a813ee011972fab425ade7ed Mon Sep 17 00:00:00 2001 From: shosseinimotlagh Date: Fri, 17 Nov 2023 12:45:49 -0800 Subject: [PATCH] index service long running --- .jenkins/Dockerfile | 19 +++++++++++++++++++ .jenkins/jenkinsfile_nightly | 27 ++++++--------------------- src/tests/test_scripts/btree_test.py | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 .jenkins/Dockerfile mode change 100644 => 100755 src/tests/test_scripts/btree_test.py diff --git a/.jenkins/Dockerfile b/.jenkins/Dockerfile new file mode 100644 index 000000000..86f486042 --- /dev/null +++ b/.jenkins/Dockerfile @@ -0,0 +1,19 @@ +# ########## ####### ############ +FROM hub.tess.io/sds/sds_develop:4.x-latest +LABEL description="Automated HomeStore compilation" + +WORKDIR /output + +RUN set -eux; \ + sed -i 's/master/latest/g' /etc/apt/sources.list; \ + apt-get update; \ + apt-get upgrade -y; \ + apt-get install iputils-ping; \ + apt-get install net-tools; \ + rm -rf /var/lib/apt/lists/*; + +COPY test_index_btree /usr/local/bin/test_index_btree +COPY btree_test.py /usr/local/bin/scripts/btree_test.py + +EXPOSE 5000 +# ########## ####### ############ \ No newline at end of file diff --git a/.jenkins/jenkinsfile_nightly b/.jenkins/jenkinsfile_nightly index 4507818a4..527af6d26 100644 --- a/.jenkins/jenkinsfile_nightly +++ b/.jenkins/jenkinsfile_nightly @@ -1,12 +1,12 @@ pipeline { - agent any + agent { label 'sds-builder-2204' } triggers { cron('TZ=US/Pacific\nH H(0-2) * * *') } environment { ORG = 'sds' - ECR_URL = 'ecr.vip.ebayc3.com' + ECR_URL = 'hub.tess.io' ARTIFACTORY_PASS = credentials('ARTIFACTORY_PASS') CONAN_USER = 'sds' failed_stage = "" @@ -24,7 +24,7 @@ pipeline { script { PROJECT = sh(script: "grep -m 1 'name =' conanfile.py | awk '{print \$3}' | tr -d '\n' | tr -d '\"'", returnStdout: true) VER = sh(script: "grep -m 1 'version =' conanfile.py | awk '{print \$3}' | tr -d '\n' | tr -d '\"'", returnStdout: true) - NIGHTLY_TAG = "master-nightly-debug" + NIGHTLY_TAG = "master-nightly-debug-4.0" ECR_PATH = "${ECR_URL}/${ORG}/${PROJECT}" failed_stage = "" } @@ -40,16 +40,9 @@ pipeline { } stage("Build") { steps { - sh "conan create --build missing -o sisl:prerelease=True -o homestore:sanitize=True -o homestore:testing=full -o homestore:skip_testing=True -pr debug . ${PROJECT}/${VER}@" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_load' -exec cp {} .jenkins/test_load \\;" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_volume' -exec cp {} .jenkins/test_volume \\;" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/check_btree' -exec cp {} .jenkins/check_btree \\;" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_log_store' -exec cp {} .jenkins/test_log_store \\;" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_meta_blk_mgr' -exec cp {} .jenkins/test_meta_blk_mgr \\;" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/hs_svc_tool ' -exec cp {} .jenkins/hs_svc_tool \\;" - sh "find . -type f -wholename '*test_scripts/vol_test.py' -exec cp -a {} .jenkins/vol_test.py \\;" - sh "find ${CONAN_USER_HOME} -type d -wholename '*bin/scripts' -exec cp -a {} .jenkins/scripts \\;" - sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_log_store' -exec cp {} .jenkins/test_log_store \\;" + sh "conan create --build missing -o sisl:prerelease=True -o homestore:sanitize=True -o homestore:skip_testing=True -pr debug . ${PROJECT}/${VER}@" + sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/test_index_btree' -exec cp {} .jenkins/test_index_btree \\;" + sh "find ${CONAN_USER_HOME} -type f -wholename '*bin/scripts/btree_test.py' -exec install -Dm755 {} .jenkins/btree_test.py \\; " } post { failure { @@ -77,12 +70,4 @@ pipeline { } } } - - post { - failure { - script { - slackSend color: '#E43237', channel: '#homestore-build', message: "@here [Nightly] HomeStore build *${PROJECT}/${VER}* has had a failure in the stage ${failed_stage}: ${BUILD_URL}" - } - } - } } diff --git a/src/tests/test_scripts/btree_test.py b/src/tests/test_scripts/btree_test.py old mode 100644 new mode 100755 index ed0389f4b..dc6390fb6 --- a/src/tests/test_scripts/btree_test.py +++ b/src/tests/test_scripts/btree_test.py @@ -76,7 +76,7 @@ def normal(): print("normal test started with (%s)" % btree_options) # " --operation_list=query:20 --operation_list=put:20 --operation_list=remove:20" - cmd_opts = " --gtest_filter=BtreeConcurrentTest/*.ConcurrentAllOps" + btree_options + " "+log_mods + cmd_opts = " --gtest_filter=BtreeConcurrentTest/*.ConcurrentAllOps --gtest_break_on_failure " + btree_options + " "+log_mods subprocess.check_call(dirpath + "test_index_btree " + cmd_opts, stderr=subprocess.STDOUT, shell=True) print("normal test completed")