From 798c3b59f8f525d90c2bb6fdd8f82bfbec901c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ott?= Date: Fri, 9 Feb 2024 16:57:18 +0100 Subject: [PATCH] Test v4 deprecation removal and new file locations --- .../oxid-esales}/codeception_Acceptance.yml | 0 .../oxid-esales}/codeception_AcceptanceSetup.yml | 0 .../oxid-esales}/codeception_acceptanceSetup_70x.yml | 0 .../oxid-esales}/codeception_acceptance_70x.yml | 0 .../oxid-esales}/deprecated_tests.yml | 0 .../oxid-esales}/deprecated_tests_only_ce.yml | 0 .../oxid-esales}/full_matrix_ce.yml | 2 +- .../oxid-esales}/full_matrix_ce_70x.yml | 2 +- {tests/github_actions => .github/oxid-esales}/phpcs_only.yml | 0 .../oxid-esales}/phpunit_integration.yml | 0 .../github_actions => .github/oxid-esales}/phpunit_unit.yml | 0 .../oxid-esales}/slim_matrix_ce.yml | 0 .../github_actions => .github/oxid-esales}/smarty_7.0.x.yml | 0 .../oxid-esales}/sonarcloud_oxideshop_ce_internal.yml | 0 .github/workflows/dispatch_dev_matrix_ce.yml | 5 +++-- 15 files changed, 5 insertions(+), 4 deletions(-) rename {tests/github_actions => .github/oxid-esales}/codeception_Acceptance.yml (100%) rename {tests/github_actions => .github/oxid-esales}/codeception_AcceptanceSetup.yml (100%) rename {tests/github_actions => .github/oxid-esales}/codeception_acceptanceSetup_70x.yml (100%) rename {tests/github_actions => .github/oxid-esales}/codeception_acceptance_70x.yml (100%) rename {tests/github_actions => .github/oxid-esales}/deprecated_tests.yml (100%) rename {tests/github_actions => .github/oxid-esales}/deprecated_tests_only_ce.yml (100%) rename {tests/github_actions => .github/oxid-esales}/full_matrix_ce.yml (85%) rename {tests/github_actions => .github/oxid-esales}/full_matrix_ce_70x.yml (77%) rename {tests/github_actions => .github/oxid-esales}/phpcs_only.yml (100%) rename {tests/github_actions => .github/oxid-esales}/phpunit_integration.yml (100%) rename {tests/github_actions => .github/oxid-esales}/phpunit_unit.yml (100%) rename {tests/github_actions => .github/oxid-esales}/slim_matrix_ce.yml (100%) rename {tests/github_actions => .github/oxid-esales}/smarty_7.0.x.yml (100%) rename {tests/github_actions => .github/oxid-esales}/sonarcloud_oxideshop_ce_internal.yml (100%) diff --git a/tests/github_actions/codeception_Acceptance.yml b/.github/oxid-esales/codeception_Acceptance.yml similarity index 100% rename from tests/github_actions/codeception_Acceptance.yml rename to .github/oxid-esales/codeception_Acceptance.yml diff --git a/tests/github_actions/codeception_AcceptanceSetup.yml b/.github/oxid-esales/codeception_AcceptanceSetup.yml similarity index 100% rename from tests/github_actions/codeception_AcceptanceSetup.yml rename to .github/oxid-esales/codeception_AcceptanceSetup.yml diff --git a/tests/github_actions/codeception_acceptanceSetup_70x.yml b/.github/oxid-esales/codeception_acceptanceSetup_70x.yml similarity index 100% rename from tests/github_actions/codeception_acceptanceSetup_70x.yml rename to .github/oxid-esales/codeception_acceptanceSetup_70x.yml diff --git a/tests/github_actions/codeception_acceptance_70x.yml b/.github/oxid-esales/codeception_acceptance_70x.yml similarity index 100% rename from tests/github_actions/codeception_acceptance_70x.yml rename to .github/oxid-esales/codeception_acceptance_70x.yml diff --git a/tests/github_actions/deprecated_tests.yml b/.github/oxid-esales/deprecated_tests.yml similarity index 100% rename from tests/github_actions/deprecated_tests.yml rename to .github/oxid-esales/deprecated_tests.yml diff --git a/tests/github_actions/deprecated_tests_only_ce.yml b/.github/oxid-esales/deprecated_tests_only_ce.yml similarity index 100% rename from tests/github_actions/deprecated_tests_only_ce.yml rename to .github/oxid-esales/deprecated_tests_only_ce.yml diff --git a/tests/github_actions/full_matrix_ce.yml b/.github/oxid-esales/full_matrix_ce.yml similarity index 85% rename from tests/github_actions/full_matrix_ce.yml rename to .github/oxid-esales/full_matrix_ce.yml index 9630114c58..4f5852c482 100644 --- a/tests/github_actions/full_matrix_ce.yml +++ b/.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 b/.github/oxid-esales/full_matrix_ce_70x.yml similarity index 77% rename from tests/github_actions/full_matrix_ce_70x.yml rename to .github/oxid-esales/full_matrix_ce_70x.yml index 7130115813..d665b91dc9 100644 --- a/tests/github_actions/full_matrix_ce_70x.yml +++ b/.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 b/.github/oxid-esales/phpcs_only.yml similarity index 100% rename from tests/github_actions/phpcs_only.yml rename to .github/oxid-esales/phpcs_only.yml diff --git a/tests/github_actions/phpunit_integration.yml b/.github/oxid-esales/phpunit_integration.yml similarity index 100% rename from tests/github_actions/phpunit_integration.yml rename to .github/oxid-esales/phpunit_integration.yml diff --git a/tests/github_actions/phpunit_unit.yml b/.github/oxid-esales/phpunit_unit.yml similarity index 100% rename from tests/github_actions/phpunit_unit.yml rename to .github/oxid-esales/phpunit_unit.yml diff --git a/tests/github_actions/slim_matrix_ce.yml b/.github/oxid-esales/slim_matrix_ce.yml similarity index 100% rename from tests/github_actions/slim_matrix_ce.yml rename to .github/oxid-esales/slim_matrix_ce.yml diff --git a/tests/github_actions/smarty_7.0.x.yml b/.github/oxid-esales/smarty_7.0.x.yml similarity index 100% rename from tests/github_actions/smarty_7.0.x.yml rename to .github/oxid-esales/smarty_7.0.x.yml diff --git a/tests/github_actions/sonarcloud_oxideshop_ce_internal.yml b/.github/oxid-esales/sonarcloud_oxideshop_ce_internal.yml similarity index 100% rename from tests/github_actions/sonarcloud_oxideshop_ce_internal.yml rename to .github/oxid-esales/sonarcloud_oxideshop_ce_internal.yml diff --git a/.github/workflows/dispatch_dev_matrix_ce.yml b/.github/workflows/dispatch_dev_matrix_ce.yml index 22edaac6c6..18c1df6ee7 100644 --- 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 }}