.prepare_haf_data_5m base job definition can have parametrized directory where...

.prepare_haf_data_5m base job definition can have parametrized directory where it should generate data

scripts/ci-helpers/prepare_data_image_job.yml

@@ -36,17 +36,18 @@ include:
     BLOCK_LOG_SOURCE_DIR: ""
     CONFIG_INI_SOURCE: ""
     HIVE_NETWORK_TYPE: mainnet
+    DATA_CACHE_DIR: "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}"
   script:
-    - mkdir "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/datadir" -pv
-    - cd "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/datadir"
-    - flock "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/datadir" $SCRIPTS_PATH/ci-helpers/build_data.sh $HAF_IMAGE_NAME
-        --data-cache="${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}" --block-log-source-dir="$BLOCK_LOG_SOURCE_DIR" --config-ini-source="$CONFIG_INI_SOURCE"
+    - mkdir "${DATA_CACHE_DIR}/datadir" -pv
+    - cd "${DATA_CACHE_DIR}/datadir"
+    - flock "${DATA_CACHE_DIR}/datadir" $SCRIPTS_PATH/ci-helpers/build_data.sh $HAF_IMAGE_NAME
+        --data-cache="${DATA_CACHE_DIR}" --block-log-source-dir="$BLOCK_LOG_SOURCE_DIR" --config-ini-source="$CONFIG_INI_SOURCE"
     - cd "$CI_PROJECT_DIR"
-    - cp "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/datadir/hived_uid.env" "$CI_PROJECT_DIR/hived_uid.env"
-    - cp "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/datadir/docker_entrypoint.log" "${CI_PROJECT_DIR}/docker_entrypoint.log"
-    - ls -la "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/datadir/"
+    - cp "${DATA_CACHE_DIR}/datadir/hived_uid.env" "$CI_PROJECT_DIR/hived_uid.env"
+    - cp "${DATA_CACHE_DIR}/datadir/docker_entrypoint.log" "${CI_PROJECT_DIR}/docker_entrypoint.log"
+    - ls -la "${DATA_CACHE_DIR}/datadir/"
   after_script:
-    - rm "${DATA_CACHE_HAF_PREFIX}_${HAF_COMMIT}/replay_running" -f
+    - rm "${DATA_CACHE_DIR}/replay_running" -f
 
   artifacts:
     reports: