Skip to content
Snippets Groups Projects
Verified Commit a586f29d authored by Konrad Botor's avatar Konrad Botor
Browse files

Moved downloading await to a separate job, so it's done only once and so...

Moved downloading await to a separate job, so it's done only once and so download failure is evident rahther than hidden in service logs - ref. #205
parent 8f843026
No related branches found
No related tags found
2 merge requests!827Merge develop changes to master,!605Resolve "Split sync_e2e_benchmark into two separate jobs"
stages:
- build
- prepare
- sync
- benchmark
- publish
......@@ -287,6 +288,22 @@ cleanup_haf_cache_manual:
tags:
- data-cache-storage
download_await:
image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-2
stage: prepare
variables:
GIT_STRATEGY: none
AWAIT_PACKAGE_URL: $CI_API_V4_URL/projects/440/packages/generic/await/v1.3.2.1/await
needs:
- job: prepare_haf_data
artifacts: false
script:
- |
wget --header "JOB-TOKEN: $CI_JOB_TOKEN" "$AWAIT_PACKAGE_URL" -O "${DATA_CACHE_HAF}/await"
chmod +x ${DATA_CACHE_HAF}/await
tags:
- data-cache-storage
sync:
image:
name: $HIVEMIND_IMAGE
......@@ -351,7 +368,6 @@ sync:
tags:
- data-cache-storage
e2e_benchmark:
image: $CI_REGISTRY_IMAGE/ci-base-image:python-3.8-slim-2
stage: benchmark
......@@ -361,6 +377,8 @@ e2e_benchmark:
artifacts: true
- job: prepare_hivemind_image
artifacts: true
- job: download_await
artifacts: false
- job: sync
artifacts: true
when: on_success
......@@ -382,9 +400,7 @@ e2e_benchmark:
- bash
- -c
- |
wget --header "JOB-TOKEN: $JOB_TOKEN" "$AWAIT_PACKAGE_URL" -O ${WORKING_DIR}/await && \
chmod +x ${WORKING_DIR}/await && \
${WORKING_DIR}/await -t 5m postgres://haf_admin@haf-instance:5432/haf_block_log#schemas=hivemind_app -- echo "Database found" && \
${DATA_CACHE_HAF}/await -t 5m postgres://haf_admin@haf-instance:5432/haf_block_log#schemas=hivemind_app -- echo "Database found" && \
${WORKING_DIR}/docker_entrypoint.sh server \
--log-request-times \
--log-request-times-path=${DATA_CACHE_HAF}/datadir/request_process_times_smoketests.log \
......@@ -400,9 +416,7 @@ e2e_benchmark:
- bash
- -c
- |
wget --header "JOB-TOKEN: $JOB_TOKEN" "$AWAIT_PACKAGE_URL" -O ${WORKING_DIR}/await && \
chmod +x ${WORKING_DIR}/await && \
${WORKING_DIR}/await -t 5m postgres://haf_admin@haf-instance:5432/haf_block_log#schemas=hivemind_app -- echo "Database found" && \
${DATA_CACHE_HAF}/await -t 5m postgres://haf_admin@haf-instance:5432/haf_block_log#schemas=hivemind_app -- echo "Database found" && \
${WORKING_DIR}/docker_entrypoint.sh server \
--log-request-times \
--log-request-times-path=${DATA_CACHE_HAF}/datadir/request_process_times.log \
......@@ -417,17 +431,14 @@ e2e_benchmark:
JOB_TOKEN: $CI_JOB_TOKEN
RUNNER_HIVEMIND_BENCHMARK_URL: http://$RUNNER_HIVEMIND_BENCHMARK_SERVER_HOSTNAME
RUNNER_HIVEMIND_SMOKETEST_URL: http://$RUNNER_HIVEMIND_SMOKETEST_SERVER_HOSTNAME
AWAIT_PACKAGE_URL: $CI_API_V4_URL/projects/440/packages/generic/await/v1.3.2.1/await
LOG_SERVER_PORT: 8090
script:
- |
echo "HAF image name $HAF_IMAGE_NAME"
echo "Hivemind image name $HIVEMIND_IMAGE"
wget --header "JOB-TOKEN: $CI_JOB_TOKEN" "$AWAIT_PACKAGE_URL"
chmod +x await
SMOKETEST_AWAIT_URL="tcp://${RUNNER_HIVEMIND_SMOKETEST_SERVER_HOSTNAME}:${RUNNER_HIVEMIND_SERVER_HTTP_PORT}"
echo "Waiting for Hivemind smoketest server to start running on ${SMOKETEST_AWAIT_URL}"
./await -t 10m "${SMOKETEST_AWAIT_URL}" -- echo "Hivemind smoketest instance is running"
"${DATA_CACHE_HAF}/await" -t 10m "${SMOKETEST_AWAIT_URL}" -- echo "Hivemind smoketest instance is running"
- *bridge_api_smoketest-script
- *bridge_api_smoketest_negative-script
- *condenser_api_smoketest-script
......@@ -443,7 +454,7 @@ e2e_benchmark:
- |
BENCHMARK_AWAIT_URL="tcp://${RUNNER_HIVEMIND_BENCHMARK_SERVER_HOSTNAME}:${RUNNER_HIVEMIND_SERVER_HTTP_PORT}"
echo "Waiting for Hivemind benchmark server to start running on ${BENCHMARK_AWAIT_URL}"
./await -t 10m "${BENCHMARK_AWAIT_URL}" -- echo "Hivemind benchmark instance is running"
"${DATA_CACHE_HAF}/await" -t 10m "${BENCHMARK_AWAIT_URL}" -- echo "Hivemind benchmark instance is running"
- *api-benchmark-script
after_script:
- |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment