Merge branch 'topic/jicquel/fix-test-buildspace-name.issue-17' into 'master'

Fix build space name for tests in .gitlab-ci.yml

See merge request eng/toolchain/gnatcoll-core!43

Author: Jicquel

.gitlab-ci.yml

@@ -58,7 +58,7 @@ test:
         --failure-exit-code 1
         --xunit-output $CI_PROJECT_DIR/test.xml
         --xunit-name gnatcoll-core
-        $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core-current-test/results/new/ || FAILED=true
+        $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core_external_test/results/new/ || FAILED=true
 
     # We previously prevented the pipeline from halting if a test failed, to make
     # sure all tests were run. If a test failed now we exit with a non-zero code
@@ -86,12 +86,12 @@ build_and_test_coverage:
     - anod vcs --add-repo gnatcoll-core $CI_PROJECT_DIR
     - anod build --latest gnatcoll-core -Qcoverage
     - anod test  --latest gnatcoll-core -Qcoverage
-    # TODO: replace build space by something computed
+
     - e3-testsuite-report
         --failure-exit-code 1
         --xunit-output $CI_PROJECT_DIR/test-coverage.xml
         --xunit-name gnatcoll-core
-        $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core-current-test-cov/results/new/ || FAILED=true
+        $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core_coverage_test/results/new/ || FAILED=true
 
     # Create test count badge
     - cd $CI_PROJECT_DIR
@@ -100,9 +100,9 @@ build_and_test_coverage:
 
     # Move coverage reports and log coverage summaries
     - mkdir $CI_PROJECT_DIR/coverage
-    - mv /it/wave/x86_64-linux/gnatcoll-core-current-test-cov/results/new/coverage-xml $CI_PROJECT_DIR/coverage/xml
-    - mv /it/wave/x86_64-linux/gnatcoll-core-current-test-cov/results/new/coverage-dhtml $CI_PROJECT_DIR/coverage/dhtml
-    - mv /it/wave/x86_64-linux/gnatcoll-core-current-test-cov/results/new/coverage-cobertura $CI_PROJECT_DIR/coverage/cobertura
+    - mv $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core_coverage_test/results/new/coverage-xml $CI_PROJECT_DIR/coverage/xml
+    - mv $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core_coverage_test/results/new/coverage-dhtml $CI_PROJECT_DIR/coverage/dhtml
+    - mv $ANOD_DEFAULT_SANDBOX_DIR/$HOST/gnatcoll-core_coverage_test/results/new/coverage-cobertura $CI_PROJECT_DIR/coverage/cobertura
     - echo_coverage_stats --coverage-file $CI_PROJECT_DIR/coverage/xml/index.xml
 
     # We previously prevented the pipeline from halting if a test failed, to make