Prerequisites for reusing `.pattern_tests_template` in Hived and HAF-apps CI

templates/test_jobs.gitlab-ci.yml

@@ -51,10 +51,12 @@ variables:
 .pattern_test_executor:
   extends: .pytest_based_template
   variables:
-    TESTED_ENDPOINT:   ""  # To be overrided in derived job
-    TEST_SUITE:        ""  # To be overrided in derived job
-    PATTERN_TESTS_DIR: ""  # To be overrided in derived job
-    DIRECT_CALLS:    0
+    TESTED_ENDPOINT: ""   # To be overrided in derived job
+    TEST_SUITE: ""        # To be overrided in derived job
+    PATTERN_TESTS_DIR: "" # To be overrided in derived job
+    DIRECT_CALLS: 0       # To be overrided in derived job
+  
+  script:
     # run pattern tests
     - cd "${PATTERN_TESTS_DIR}"
     - ./run_tests.sh ${TESTED_ENDPOINT} `git rev-parse --show-toplevel` "${TEST_SUITE}" ${DIRECT_CALLS}
@@ -66,7 +68,7 @@ variables:
   extends: .pattern_test_executor
   variables:
     HIVED_IMAGE_NAME: ""  # Must be overrided at derived job
-    ENDPOINT: hived-instance:8091
+    TESTED_ENDPOINT: hived-instance:8091
   services:
     - name: $HIVED_IMAGE_NAME
       alias: hived-instance
@@ -78,12 +80,12 @@ variables:
 
 
 .haf_app_pattern_tests_template:
-  extends: .pattern_test_executor:
+  extends: .pattern_test_executor
   variables:
     HAF_IMAGE_NAME: ""  # Must be overrided at derived job
     HAF_APP_IMAGE:  ""  # Image path name to be used at app testing. App will be instantiated as a service.
     HAF_APP_PORT:   ""  # To be specified by derived job
-    ENDPOINT: app:${HAF_APP_PORT}
+    TESTED_ENDPOINT: app:${HAF_APP_PORT}
   services:
     - name: ${HAF_IMAGE_NAME}
       alias: haf-instance
@@ -130,4 +132,4 @@ variables:
     - !reference [.hived_pattern_tests_template, services]
     - !reference [.haf_app_pattern_tests_template, services]
   script:
-    - python3 -m pytest -n 8 --ref http://$HIVED_ENDPOINT --test http://$ENDPOINT --start 4900000 --stop 4915000 --junitxml=${JUNIT_REPORT}
+    - python3 -m pytest -n 8 --ref http://$HIVED_ENDPOINT --test http://$TESTED_ENDPOINT --start 4900000 --stop 4915000 --junitxml=${JUNIT_REPORT}