Test v4 deprecation removal and new file locations

OXID-eSales · Feb 9, 2024 · 798c3b5 · 798c3b5
1 parent 4951feb
commit 798c3b5
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 4 deletions.
diff --git a/...github_actions/codeception_Acceptance.yml → ...ub/oxid-esales/codeception_Acceptance.yml b/...github_actions/codeception_Acceptance.yml → ...ub/oxid-esales/codeception_Acceptance.yml
diff --git a/...b_actions/codeception_AcceptanceSetup.yml → ...id-esales/codeception_AcceptanceSetup.yml b/...b_actions/codeception_AcceptanceSetup.yml → ...id-esales/codeception_AcceptanceSetup.yml
diff --git a/...tions/codeception_acceptanceSetup_70x.yml → ...sales/codeception_acceptanceSetup_70x.yml b/...tions/codeception_acceptanceSetup_70x.yml → ...sales/codeception_acceptanceSetup_70x.yml
diff --git a/...ub_actions/codeception_acceptance_70x.yml → ...xid-esales/codeception_acceptance_70x.yml b/...ub_actions/codeception_acceptance_70x.yml → ...xid-esales/codeception_acceptance_70x.yml
diff --git a/tests/github_actions/deprecated_tests.yml → .github/oxid-esales/deprecated_tests.yml b/tests/github_actions/deprecated_tests.yml → .github/oxid-esales/deprecated_tests.yml
diff --git a/...thub_actions/deprecated_tests_only_ce.yml → .../oxid-esales/deprecated_tests_only_ce.yml b/...thub_actions/deprecated_tests_only_ce.yml → .../oxid-esales/deprecated_tests_only_ce.yml
diff --git a/tests/github_actions/full_matrix_ce.yml → .github/oxid-esales/full_matrix_ce.yml b/tests/github_actions/full_matrix_ce.yml → .github/oxid-esales/full_matrix_ce.yml
@@ -12,7 +12,7 @@ phpcs_tests:
 
 sonarcloud:
   matrix:
-    testplan: '["-","tests/github_actions/sonarcloud_oxideshop_ce_internal.yml"]'
+    testplan: '["-","~/sonarcloud_oxideshop_ce_internal.yml"]'
 
 finish:
   slack_title: 'Full matrix CE ({{ .Data.global.git.shop_ref }}) on {{ .Github.Repository }} by {{ .Github.Actor }}'
diff --git a/tests/github_actions/full_matrix_ce_70x.yml → .github/oxid-esales/full_matrix_ce_70x.yml b/tests/github_actions/full_matrix_ce_70x.yml → .github/oxid-esales/full_matrix_ce_70x.yml
@@ -3,7 +3,7 @@
 
 codeception:
   matrix:
-    testplan: '["tests/github_actions/codeception_acceptance_70x.yml","tests/github_actions/codeception_acceptanceSetup_70x.yml"]'
+    testplan: '["~/codeception_acceptance_70x.yml","~/codeception_acceptanceSetup_70x.yml"]'
   # Running on public runners, this should pose no problem
   max_parallel: &codeception_max_parallel 4
 

diff --git a/tests/github_actions/phpcs_only.yml → .github/oxid-esales/phpcs_only.yml b/tests/github_actions/phpcs_only.yml → .github/oxid-esales/phpcs_only.yml
diff --git a/tests/github_actions/phpunit_integration.yml → .github/oxid-esales/phpunit_integration.yml b/tests/github_actions/phpunit_integration.yml → .github/oxid-esales/phpunit_integration.yml
diff --git a/tests/github_actions/phpunit_unit.yml → .github/oxid-esales/phpunit_unit.yml b/tests/github_actions/phpunit_unit.yml → .github/oxid-esales/phpunit_unit.yml
diff --git a/tests/github_actions/slim_matrix_ce.yml → .github/oxid-esales/slim_matrix_ce.yml b/tests/github_actions/slim_matrix_ce.yml → .github/oxid-esales/slim_matrix_ce.yml
diff --git a/tests/github_actions/smarty_7.0.x.yml → .github/oxid-esales/smarty_7.0.x.yml b/tests/github_actions/smarty_7.0.x.yml → .github/oxid-esales/smarty_7.0.x.yml
diff --git a/...ions/sonarcloud_oxideshop_ce_internal.yml → ...ales/sonarcloud_oxideshop_ce_internal.yml b/...ions/sonarcloud_oxideshop_ce_internal.yml → ...ales/sonarcloud_oxideshop_ce_internal.yml
diff --git a/.github/workflows/dispatch_dev_matrix_ce.yml b/.github/workflows/dispatch_dev_matrix_ce.yml
@@ -8,7 +8,7 @@ on:
         type: string
         required: true
         description: 'URL/PATH of the testplan to run'
-        default: 'tests/github_actions/full_matrix_ce.yml'
+        default: '~/defaults/7.0.x.yml,~/full_matrix_ce.yml'
       runs_on:
         type: string
         description: 'JSON string/array describing the runner'
@@ -21,7 +21,8 @@ jobs:
     with:
       testplan: ${{ inputs.testplan }}
       runs_on: ${{ inputs.runs_on }}
-      defaults: 'v0'
+      defaults: 'v4alpha'
+      plan_folder: '.github/oxid-esales'
     secrets:
       DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
       DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}