Refactored data image jobs - ref. hive#406

.gitlab-ci.yaml

@@ -4,13 +4,11 @@ stages:
   - collector
   - cleanup
 
-
 include:
   - project: hive/haf
-    ref: 51768056086910b6a051283d9831df6506a7d82f # develop 
+    ref: 7d52319046375526badc926587c26ba0431f388d # develop 
     file: /scripts/ci-helpers/prepare_data_image_job.yml
 
-
 variables:
   # HIVEMIND
   RUNNER_HIVEMIND_SERVER_HTTP_PORT: 8080
@@ -36,7 +34,6 @@ workflow:
       when: never
     - when: always
 
-
 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>| ANCHORS |>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 .shared_tags:
@@ -44,17 +41,14 @@ workflow:
     - public-runner-docker
     - hived-for-tests
 
-
 .start-timer: &start-timer
   - ./scripts/ci/timer.sh start
 
-
 .check-timer: &check-timer
   - ./scripts/ci/timer.sh check
 
 #<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<| ANCHORS |<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
-
 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>| BASH SCRIPTS |>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 .bridge_api_smoketest-script: &bridge_api_smoketest-script
@@ -66,7 +60,6 @@ workflow:
         api_smoketest_bridge.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .bridge_api_smoketest_negative-script: &bridge_api_smoketest_negative-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -76,7 +69,6 @@ workflow:
         api_smoketest_bridge_negative.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .condenser_api_smoketest-script: &condenser_api_smoketest-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -86,7 +78,6 @@ workflow:
         api_smoketest_condenser_api.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .condenser_api_smoketest_negative-script: &condenser_api_smoketest_negative-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -96,7 +87,6 @@ workflow:
         api_smoketest_condenser_api_negative.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .database_api_smoketest-script: &database_api_smoketest-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -106,7 +96,6 @@ workflow:
         api_smoketest_database_api.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .database_api_smoketest_negative-script: &database_api_smoketest_negative-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -116,7 +105,6 @@ workflow:
         api_smoketest_database_api_negative.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .follow_api_smoketest-script: &follow_api_smoketest-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -126,7 +114,6 @@ workflow:
         api_smoketest_follow_api.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .follow_api_smoketest_negative-script: &follow_api_smoketest_negative-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -136,7 +123,6 @@ workflow:
         api_smoketest_follow_api_negative.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .tags_api_smoketest-script: &tags_api_smoketest-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -146,7 +132,6 @@ workflow:
         api_smoketest_tags_api_negative.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .tags_api_smoketest_negative-script: &tags_api_smoketest_negative-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -156,7 +141,6 @@ workflow:
         api_smoketest_tags_api.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .mock_tests-script: &mock_tests-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -166,7 +150,6 @@ workflow:
         api_smoketest_mock_tests.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .hive_api_smoketest-script: &hive_api_smoketest-script
   - |
     ./scripts/ci/start-api-smoketest.sh \
@@ -176,7 +159,6 @@ workflow:
         api_smoketest_hive_api.xml \
         $RUNNER_PYTEST_WORKERS
 
-
 .api-benchmark-script: &api-benchmark-script
   - |
     ./scripts/ci/start-api-benchmarks.sh \
@@ -187,7 +169,6 @@ workflow:
 
 #<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<| BASH SCRIPTS |<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
-
 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>| JOBS |>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 prepare_haf_image:
@@ -199,7 +180,6 @@ prepare_haf_image:
     REGISTRY_PASS: "$HAF_IMG_BUILDER_PASSWORD"
   tags: *shared_tags
 
-
 prepare_haf_data:
   extends: .prepare_haf_data_5m
   needs:
@@ -213,7 +193,6 @@ prepare_haf_data:
   tags:
     - hive-builder-4
 
-
 cleanup_haf_cache_manual:
   extends: .cleanup_cache_manual
   stage: cleanup
@@ -223,7 +202,6 @@ cleanup_haf_cache_manual:
   tags:
     - hive-builder-4
 
-
 sync_e2e_benchmark:
   image: $CI_REGISTRY_IMAGE/ci_base_image:3.8
   stage: sync-e2e-benchmark
@@ -303,7 +281,6 @@ sync_e2e_benchmark:
   tags:
     - hive-builder-4
 
-
 Trigger benchmark-results-collector:
   stage: collector
   needs: [ 'sync_e2e_benchmark' ]

haf @ 7d523190

-Subproject commit b8c226dfc1b04bfb835bc70d5de01d01ee3c7ffb
+Subproject commit 7d52319046375526badc926587c26ba0431f388d