Merge branch 'b-7.1.x' into b-7.2.x

OXID-eSales · Sep 19, 2024 · e6203cc · e6203cc
2 parents 62e5d89 + a10c722
commit e6203cc
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 10 deletions.
diff --git a/.github/oxid-esales/shop_ce.yaml b/.github/oxid-esales/shop_ce.yaml
@@ -47,7 +47,7 @@ runscript: &runscript
     path: ''
     container:
       # {{ $selenium_options := "-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome" }}
-      options: '-e XDEBUG_MODE=coverage {{ $selenium_options }} -e GITHUB_EVENT_NAME="{{ .Github.EventName }}" -e GITHUB_BASE_REF="{{ .Github.BaseRef }}" -e GITHUB_REF="refs/heads/{{ .Data.global.git.shop_ref }}" -e GITHUB_REF_NAME="{{ .Data.global.git.shop_ref }}"'
+      options: '-e XDEBUG_MODE=coverage -e CODECEPTION_OPTIONS="--ext DotReporter --skip-group flow_theme" {{ $selenium_options }} -e GITHUB_EVENT_NAME="{{ .Github.EventName }}" -e GITHUB_BASE_REF="{{ .Github.BaseRef }}" -e GITHUB_REF="refs/heads/{{ .Data.global.git.shop_ref }}" -e GITHUB_REF_NAME="{{ .Data.global.git.shop_ref }}"'
   setup:
     <<: *shop
     load_shop: '{{ .Data.install_shop_with_modules.cache.prepared_shop_prefix }}'
@@ -63,5 +63,5 @@ sonarcloud:
   strip_path: '/var/www/vendor/{{ print $org }}/{{ print $name}}/'
 
 finish:
-  slack_title: 'Shop CE ({{ .Data.install.git.shop_ref }}) by {{ .Github.Actor }}'
+  slack_title: 'Shop CE ({{ .Data.global.git.ref }}) by {{ .Github.Actor }}'
   slack_compact: true
diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml
@@ -9,7 +9,7 @@ jobs:
     if: always()
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.1.x.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
+      testplan: '~/defaults/7.1.x.yaml,~/defaults/php8.1_8.2_mysql8.0_only.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'
@@ -34,7 +34,7 @@ jobs:
     if: always()
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.2.x.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
+      testplan: '~/defaults/7.2.x.yaml,~/defaults/php8.2_8.3_mysql8.0_only.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'
@@ -59,7 +59,7 @@ jobs:
     if: always()
     uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/8.0.x.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
+      testplan: '~/defaults/8.0.x.yaml,~/defaults/php8.2_8.3_mysql8.0_only.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'

diff --git a/.github/workflows/scheduled_mariadb.yaml b/.github/workflows/scheduled_mariadb.yaml
@@ -0,0 +1,81 @@
+name: Weekly MariaDB runs
+
+on:
+  schedule:
+    - cron: '17 23 * * 6'
+
+jobs:
+  oxideshop_ce_71x_nightly:
+    if: always()
+    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
+    with:
+      testplan: '~/defaults/7.1.x.yaml,~/defaults/php8.1_8.2_mariadb11_only.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
+      runs_on: '"ubuntu-latest"'
+      defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
+      custom_testplan_yaml: |
+        global:
+          title: '7.1.x-mariadb-weekly'
+        finish:
+          slack_title: 'Weekly Shop CE 7.1.x/MariaDB on {{ .Github.Repository }}'
+      use_scheduled_slack_channel: true
+    secrets:
+      DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+      DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+      CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
+      CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
+      CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
+      enterprise_github_token: ${{ secrets.enterprise_github_token }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      SLACK_SCHEDULED_WEBHOOK_URL: ${{ secrets.SLACK_SCHEDULED_WEBHOOK_URL }}
+
+  oxideshop_ce_72x_nightly:
+    if: always()
+    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
+    with:
+      testplan: '~/defaults/7.2.x.yaml,~/defaults/php8.2_8.3_mariadb11_only.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
+      runs_on: '"ubuntu-latest"'
+      defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
+      custom_testplan_yaml: |
+        global:
+          title: '7.2.x-mariadb-weekly'
+        finish:
+          slack_title: 'Weekly Shop CE 7.2.x/MariaDB on {{ .Github.Repository }}'  
+      use_scheduled_slack_channel: true
+    secrets:
+      DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+      DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+      CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
+      CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
+      CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
+      enterprise_github_token: ${{ secrets.enterprise_github_token }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      SLACK_SCHEDULED_WEBHOOK_URL: ${{ secrets.SLACK_SCHEDULED_WEBHOOK_URL }}
+
+  oxideshop_ce_80x_nightly:
+    if: always()
+    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
+    with:
+      testplan: '~/defaults/8.0.x.yaml,~/defaults/php8.2_8.3_mariadb11_only.yaml,~/defaults/scheduled.yaml,~/shop_ce.yaml'
+      runs_on: '"ubuntu-latest"'
+      defaults: 'v4'
+      plan_folder: '.github/oxid-esales'
+      custom_testplan_yaml: |
+        global:
+          title: '8.0.x-mariadb-weekly'
+        finish:
+          slack_title: 'Weekly Shop CE 8.0.x/MariaDB on {{ .Github.Repository }}'
+      use_scheduled_slack_channel: true
+    secrets:
+      DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
+      DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
+      CACHE_ENDPOINT: ${{ secrets.CACHE_ENDPOINT }}
+      CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
+      CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
+      enterprise_github_token: ${{ secrets.enterprise_github_token }}
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      SLACK_SCHEDULED_WEBHOOK_URL: ${{ secrets.SLACK_SCHEDULED_WEBHOOK_URL }}
diff --git a/tests/scripts/codeception.sh b/tests/scripts/codeception.sh
@@ -89,9 +89,8 @@ RESULT=$?
 echo "Codecept build exited with error code ${RESULT}"
 "${CODECEPT}" run "${SUITE}" \
     -c "${ABSOLUTE_PATH}/${TESTDIR}/codeception.yml" \
-    --ext DotReporter \
+    ${CODECEPTION_OPTIONS} \
     -o "paths: output: ${OUTPUT_DIR}" 2>&1 \
-    --skip-group flow_theme \
 | tee "${LOG_FILE}"
 RESULT=$?
 echo "Codecept run exited with error code ${RESULT}"

diff --git a/tests/scripts/integration.sh b/tests/scripts/integration.sh
@@ -73,7 +73,12 @@ EOF
 
 init
 
-"${PHPUNIT}" -c "${XML_FILE}" --bootstrap "${BOOTSTRAP}" --coverage-clover="${COVERAGE_FILE}" "${SUITE}" 2>&1 \
+"${PHPUNIT}" \
+    -c "${XML_FILE}" \
+    --bootstrap "${BOOTSTRAP}" \
+    --coverage-clover="${COVERAGE_FILE}" \
+    ${INTEGRATION_OPTIONS} \
+    "${SUITE}" 2>&1 \
 | tee "${LOG_FILE}"
 RESULT=$?
 echo "phpunit exited with error code ${RESULT}"

diff --git a/tests/scripts/shop-setup.sh b/tests/scripts/shop-setup.sh
@@ -104,7 +104,7 @@ RESULT=$?
 echo "codecept build exited with error code ${RESULT}"
 "${CODECEPT}" run "${SUITE}" \
     -c "${ABSOLUTE_PATH}/${TESTDIR}/codeception.yml" \
-    --ext DotReporter \
+    ${SHOP_SETUP_OPTIONS} \
     -o "paths: output: ${OUTPUT_DIR}" 2>&1 \
 | tee "${LOG_FILE}"
 RESULT=$?

diff --git a/tests/scripts/unit.sh b/tests/scripts/unit.sh
@@ -73,7 +73,12 @@ EOF
 
 init
 
-"${PHPUNIT}" -c "${XML_FILE}" --bootstrap "${BOOTSTRAP}" --coverage-clover="${COVERAGE_FILE}" "${SUITE}" 2>&1 \
+"${PHPUNIT}" \
+    -c "${XML_FILE}" \
+    --bootstrap "${BOOTSTRAP}" \
+    --coverage-clover="${COVERAGE_FILE}" \
+    ${UNIT_OPTIONS} \
+    "${SUITE}" 2>&1 \
 | tee "${LOG_FILE}"
 RESULT=$?
 echo "phpunit exited with error code ${RESULT}"