#45 Change test log strategy

test-and-deploy.yml

@@ -321,9 +321,9 @@ Debug:
     - mkdir -p files/default/files/translations
     - chmod -R ugo+w files/default/files/
     # Prepare log directory for tests.
-    - dc exec -u root php mkdir -p /tmp/testlogs
-    - dc exec -u root php rm -rf /tmp/testlogs/*
-    - dc exec -u root php chmod oug+w /tmp/testlogs
+    - dc exec -u root php mkdir -p /tmp/logs
+    - dc exec -u root php rm -rf /tmp/logs/*
+    - dc exec -u root php chmod oug+w /tmp/logs
   artifacts:
     name: build
     when: always

tests/lakedrops.yml

@@ -6,7 +6,7 @@
   variables:
     GIT_STRATEGY: none
   after_script:
-    - dc cp php:/tmp/testlogs/* .
+    - dc cp php:/tmp/logs .
   needs: ['Build Site']
   dependencies:
     - 'Build Site'
@@ -18,7 +18,7 @@
     - DIR=$(dc exec -u root php pwd)
     - if [[ "${THEME_BUILD}" == "yes" && -d ${THEME_CSS_PATH} ]]; then dc cp ${THEME_CSS_PATH} php:${DIR}/${THEME_CSS_PATH}; fi
   after_script:
-    - dc cp php:/tmp/testlogs/* .
+    - dc cp php:/tmp/logs .
     - if [[ "${THEME_BUILD}" == "yes" && -d ${THEME_CSS_PATH} ]]; then dc exec -u root php rm -rf ${THEME_CSS_PATH}; fi
   dependencies:
     - 'Build Site'
@@ -27,27 +27,27 @@
 Test Code Style:
   <<: *test_lakedrops_default
   script:
-    - ahoy test phpcs -- --report=xml --report-file=/tmp/testlogs/phpcs.xml
+    - ahoy test phpcs -- --report=xml --report-file=/tmp/logs/phpcs.xml
   artifacts:
     name: phpcs
     when: always
     paths:
-      - phpcs.xml
+      - logs/phpcs.xml
   rules:
     - if: '$DISABLE_CI_TEST_CODESTYLE != "1"'
 
 Test PHPUnit:
   <<: *test_lakedrops_default
   script:
-    - ahoy test phpunit -- --log-junit /tmp/testlogs/junit.xml --testdox-html /tmp/testlogs/testdox.html
+    - ahoy test phpunit -- --log-junit /tmp/logs/junit.xml --testdox-html /tmp/logs/testdox.html
   artifacts:
     name: phpunit
     when: always
     paths:
-      - junit.xml
-      - testdox.html
+      - logs/junit.xml
+      - logs/testdox.html
     reports:
-      junit: junit.xml
+      junit: logs/junit.xml
   rules:
     - if: '$DISABLE_CI_TEST_PHPUNIT != "1"'
 
@@ -68,12 +68,12 @@ Test Behat:
     - job: Update DB
       optional: true
   script:
-    - ahoy behat exec -- --format junit --out /tmp/testlogs/default.xml
+    - ahoy behat exec -- --format junit --out /tmp/logs
   artifacts:
     name: behat
     when: always
     paths:
-      - default.xml
+      - logs/default.xml
   rules:
     - if: '$DISABLE_CI_TEST_BEHAT != "1"'