Merge pull request #2809 from elkoniu/update-mantra-send-routine

chore: Send results to mantra using newly introduced template

Author: elkoniu

.gitlab-ci-full-integration-generator.yml

@@ -16,21 +16,16 @@ test:integration:generator:
   script:
   - apt-get update && apt-get install -y gettext-base
   - |
-    if [ "$NIGHTLY_BUILD" = "true" ]; then
-      MANTRA_BUILD_NAME="nightly-$(date +%Y-%m-%d)"
-    else
-      MANTRA_BUILD_NAME="pullreq-$(date +%Y-%m-%d)-${CI_PIPELINE_ID}"
-    fi
     MANTRA_PROJECT_NAME="full_integration"
 
     # Export for envsubst
-    export MANTRA_BUILD_NAME MANTRA_PROJECT_NAME
+    export MANTRA_PROJECT_NAME
 
   - touch gitlab-ci-full-integration-jobs.yml
   - CI_NODE_TOTAL=$CI_JOBS_IN_PARALLEL_INTEGRATION
   - export CI_NODE_TOTAL CI_NODE_INDEX
   - for CI_NODE_INDEX in $(seq $CI_JOBS_IN_PARALLEL_INTEGRATION); do
-  -   envsubst '$CI_NODE_TOTAL,$CI_NODE_INDEX,$MANTRA_BUILD_NAME,$MANTRA_PROJECT_NAME' < .gitlab-ci-full-integration-template.yml >> gitlab-ci-full-integration-jobs.yml
+  -   envsubst '$CI_NODE_TOTAL,$CI_NODE_INDEX,$MANTRA_PROJECT_NAME' < .gitlab-ci-full-integration-template.yml >> gitlab-ci-full-integration-jobs.yml
   - done
   artifacts:
     paths:

.gitlab-ci-full-integration-template.yml

@@ -1,4 +1,9 @@
 # The CI job name will be unique after substitution from the generator.
+include:
+  - project: "Northern.tech/Mender/mendertesting"
+    file: "qa-common/send-results-to-mantra.yml"
+    ref: "master"
+
 test:integration:$CI_NODE_INDEX:
   rules:
     - if: $RUN_TESTS_FULL_INTEGRATION == "true"
@@ -56,26 +61,14 @@ test:integration:$CI_NODE_INDEX:
     - sysctl -w fs.inotify.max_user_instances=1024
     - sysctl -w fs.file-max=600000
     - ulimit -n 524288
-    # Mantra uploader: pull the helper script from mender-qa once. It’s tiny (<1 KiB).
-    - |
-      curl -sSfL \
-        https://raw.githubusercontent.com/mendersoftware/mender-qa/074b590110e1793ada4acac7bb7b1add8fe40981/scripts/mantra_post_test_results \
-        -o /usr/local/bin/mantra_post_test_results
-      chmod +x /usr/local/bin/mantra_post_test_results
 
   script:
     - cd tests
     - ./run.sh
 
   after_script:
     # Post results to Mantra
-    - |
-      echo "Uploading to Mantra with project=$MANTRA_PROJECT_NAME build=$MANTRA_BUILD_NAME"
-
-      /usr/local/bin/mantra_post_test_results --ensure \
-        "$MANTRA_PROJECT_NAME" \
-        "$MANTRA_BUILD_NAME" \
-        tests/results.xml || true   # never fail the job if Mantra is down
+    - !reference [.mantra-push-results]
 
   artifacts:
     expire_in: 2w

.gitlab-ci.yml

@@ -47,7 +47,7 @@ variables:
 
   DOCKER_VERSION:
     description: "Docker version to use in jobs"
-    value: "27.3"
+    value: "28"
 
   MENDER_SERVER_TAG:
     description: "Mender Server Docker tag for running integration tests"