Skip to content

Commit

Permalink
B 7.0 workflow improvements (#16)
Browse files Browse the repository at this point in the history 
* Cleanup test plans
  • Loading branch information
@joernott
joernott authored Sep 13, 2024
1 parent 5e922cb commit a89f8fa
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 490 deletions.
66 changes: 7 additions & 59 deletions .github/oxid-esales/metapackage-7.0-full.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,44 +54,6 @@ install:
"phpstan/phpstan": "^1.9.14",
"squizlabs/php_codesniffer": "^3.5.4"
},
"repositories": {
"oxid-esales/oxideshop-ce": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop_ce.git"
},
"oxid-esales/gdpr-optin-module": {
"type": "git",
"url": "https://github.com/OXID-eSales/gdpr-optin-module.git"
},
"oxid-esales/oxideshop-composer-plugin": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop_composer_plugin.git"
},
"oxid-esales/oxideshop-doctrine-migration-wrapper": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper.git"
},
"oxid-esales/oxideshop-facts": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-facts.git"
},
"oxid-esales/oxideshop-unified-namespace-generator": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-unified-namespace-generator.git"
},
"oxid-esales/twig-component": {
"type": "git",
"url": "https://github.com/OXID-eSales/twig-component.git"
},
"oxid-professional-services/usercentrics": {
"type": "git",
"url": "https://github.com/OXID-eSales/usercentrics.git"
},
"makaira/oxid-connect-essential": {
"type": "git",
"url": "https://github.com/MakairaIO/oxid-connect-essential.git"
}
},
"autoload-dev":{
"psr-4":{
"OxidEsales\\EshopCommunity\\Tests\\":"./vendor/oxid-esales/oxideshop-ce/tests",
Expand Down Expand Up @@ -166,22 +128,20 @@ runscript: &runscript
"ddoe_wysiwyg_codeception_twig:~/codeception.sh acceptance"
]
container:
# yamllint disable-line rule:line-length
options: '-e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e ESHOP_BOOTSTRAP_PATH=vendor/oxid-esales/oxideshop-ce/source/bootstrap.php -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
# {{ $selenium_options := "-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome" }}
# {{ $module_ids := "-e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg" }}
options: '-e XDEBUG_MODE=coverage -e THEME_ID=apex {{ $selenium_options }} {{ $module_ids }}'
composer:
early: skip
workdir: ''
shop:
path: 'vendor/oxid-esales/oxideshop-ce'
workdir: 'vendor/oxid-esales/oxideshop-ce'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e TEST_SUITE=/var/www/vendor/oxid-esales/oxideshop-ce/tests -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
facts:
path: 'vendor/oxid-esales/oxideshop-facts'
container:
# yamllint disable-line rule:line-length
options: '-e SUITE=vendor/oxid-esales/oxideshop-facts/tests -e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e TEST_SUITE=/var/www/vendor/oxid-esales/oxideshop-ce/tests -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e SUITE=vendor/oxid-esales/oxideshop-facts/tests -e XDEBUG_MODE=coverage -e THEME_ID=apex {{ $selenium_options }} {{ $module_ids }}'
gdpr:
path: 'vendor/oxid-esales/gdpr-optin-module'
custom_script: |
Expand All @@ -199,22 +159,18 @@ runscript: &runscript
twig:
path: 'vendor/oxid-esales/twig-component'
workdir: '~'
custom_script: |
cp -a .github/oxid-esales/defaults/scripts/*.sh source/vendor/oxid-esales/twig-component/tests/scripts/
# custom_script: |
# cp -a .github/oxid-esales/defaults/scripts/*.sh source/vendor/oxid-esales/twig-component/tests/scripts/
usercentrics:
path: 'vendor/oxid-professional-services/usercentrics'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
makaira:
path: 'vendor/makaira/oxid-connect-essential'
ddoe_wysiwyg:
path: 'vendor/ddoe/wysiwyg-editor-module'
ddoe_wysiwyg_codeception_twig:
path: 'vendor/ddoe/wysiwyg-editor-module'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e XDEBUG_MODE=coverage -e THEME_ID=twig {{ $selenium_options }} {{ $module_ids }}'
composer:
early: false
transform: |
Expand Down Expand Up @@ -249,14 +205,6 @@ runscript: &runscript
}
medialibrary:
path: 'vendor/oxid-esales/media-library-module'
runslim:
<<: *runscript
matrix:
script: |
[
"gdpr:~/php-cs-report.sh"
]
sonarcloud:
matrix:
testplan: 'skip'
Expand Down
58 changes: 4 additions & 54 deletions .github/oxid-esales/metapackage-7.0-slim.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,44 +49,6 @@ install:
"phpstan/phpstan": "^1.9.14",
"squizlabs/php_codesniffer": "^3.5.4"
},
"repositories": {
"oxid-esales/oxideshop-ce": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop_ce.git"
},
"oxid-esales/gdpr-optin-module": {
"type": "git",
"url": "https://github.com/OXID-eSales/gdpr-optin-module.git"
},
"oxid-esales/oxideshop-composer-plugin": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop_composer_plugin.git"
},
"oxid-esales/oxideshop-doctrine-migration-wrapper": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper.git"
},
"oxid-esales/oxideshop-facts": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-facts.git"
},
"oxid-esales/oxideshop-unified-namespace-generator": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-unified-namespace-generator.git"
},
"oxid-esales/twig-component": {
"type": "git",
"url": "https://github.com/OXID-eSales/twig-component.git"
},
"oxid-professional-services/usercentrics": {
"type": "git",
"url": "https://github.com/OXID-eSales/usercentrics.git"
},
"makaira/oxid-connect-essential": {
"type": "git",
"url": "https://github.com/MakairaIO/oxid-connect-essential.git"
}
},
"autoload-dev":{
"psr-4":{
"OxidEsales\\EshopCommunity\\Tests\\":"./vendor/oxid-esales/oxideshop-ce/tests",
Expand Down Expand Up @@ -138,17 +100,15 @@ runscript: &runscript
"usercentrics:~/codeception.sh acceptance",
"ddoe_wysiwyg_codeception_twig:~/codeception.sh acceptance" ]
container:
# yamllint disable-line rule:line-length
options: '-e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e ESHOP_BOOTSTRAP_PATH=vendor/oxid-esales/oxideshop-ce/source/bootstrap.php -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
# {{ $selenium_options := "-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome" }}
# {{ $module_ids := "-e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg" }}
options: '-e XDEBUG_MODE=coverage -e THEME_ID=apex {{ $selenium_options }} {{ $module_ids }}'
composer:
early: skip
workdir: ''
shop:
path: 'vendor/oxid-esales/oxideshop-ce'
workdir: 'vendor/oxid-esales/oxideshop-ce'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e TEST_SUITE=/var/www/vendor/oxid-esales/oxideshop-ce/tests -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
gdpr:
path: 'vendor/oxid-esales/gdpr-optin-module'
custom_script: |
Expand All @@ -158,8 +118,6 @@ runscript: &runscript
usercentrics:
path: 'vendor/oxid-professional-services/usercentrics'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
makaira:
path: 'vendor/makaira/oxid-connect-essential'
ddoe_wysiwyg:
Expand All @@ -168,7 +126,7 @@ runscript: &runscript
path: 'vendor/ddoe/wysiwyg-editor-module'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e XDEBUG_MODE=coverage -e THEME_ID=twig {{ $selenium_options }} {{ $module_ids }}'
composer:
transform: |
{
Expand Down Expand Up @@ -203,14 +161,6 @@ runscript: &runscript
medialibrary:
path: 'vendor/oxid-esales/media-library-module'

runslim:
<<: *runscript
matrix:
script: |
[
"gdpr:~/php-cs-report.sh"
]
sonarcloud:
matrix:
testplan: 'skip'
Expand Down
74 changes: 12 additions & 62 deletions .github/oxid-esales/metapackage-7.1-full.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ install:
vendor/makaira/oxid-connect-essential/tests/scripts
vendor/ddoe/wysiwyg-editor-module/tests/scripts
vendor/oxid-esales/media-library-module/tests/scripts
vendor/eyeable/eye-able-oxid/tests/scripts/tests/scripts
vendor/eyeable/eye-able-oxid/tests/scripts
vendor/oxid-esales/oxideshop-composer-plugin/tests/scripts
vendor/oxid-esales/oxideshop-demodata-installer/tests/scripts
vendor/oxid-esales/oxideshop-doctrine-migration-wrapper/tests/scripts
Expand Down Expand Up @@ -55,44 +55,6 @@ install:
"phpstan/phpstan": "^1.9.14",
"squizlabs/php_codesniffer":"^3.5.4"
},
"repositories": {
"oxid-esales/oxideshop-ce": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop_ce.git"
},
"oxid-esales/gdpr-optin-module": {
"type": "git",
"url": "https://github.com/OXID-eSales/gdpr-optin-module.git"
},
"oxid-esales/oxideshop-composer-plugin": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop_composer_plugin.git"
},
"oxid-esales/oxideshop-doctrine-migration-wrapper": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper.git"
},
"oxid-esales/oxideshop-facts": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-facts.git"
},
"oxid-esales/oxideshop-unified-namespace-generator": {
"type": "git",
"url": "https://github.com/OXID-eSales/oxideshop-unified-namespace-generator.git"
},
"oxid-esales/twig-component": {
"type": "git",
"url": "https://github.com/OXID-eSales/twig-component.git"
},
"oxid-professional-services/usercentrics": {
"type": "git",
"url": "https://github.com/OXID-eSales/usercentrics.git"
},
"makaira/oxid-connect-essential": {
"type": "git",
"url": "https://github.com/MakairaIO/oxid-connect-essential.git"
}
},
"autoload-dev":{
"psr-4":{
"OxidEsales\\EshopCommunity\\Tests\\":"./vendor/oxid-esales/oxideshop-ce/tests",
Expand Down Expand Up @@ -170,27 +132,25 @@ runscript: &runscript
"medialibrary:~/unit.sh",
"medialibrary:~/integration.sh",
"medialibrary:~/codeception.sh",
"eyable:~/integration.sh",
"eyable:~/codeception.sh"
"eyeable:~/integration.sh",
"eyeable:~/codeception.sh"
]
container:
# {{ $module_ids := "oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg,ddoemedialibrary,eyeable_assist" }}
# {{ $selenium_options := "-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome" }}
# {{ $module_ids := "-e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg,ddoemedialibrary,eyeable_assist" }}
# yamllint disable-line rule:line-length
options: '-e THEME_ID=apex -e MODULE_IDS={{ $module_ids }} -e ESHOP_BOOTSTRAP_PATH=vendor/oxid-esales/oxideshop-ce/source/bootstrap.php -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e XDEBUG_MODE=coverage -e THEME_ID=apex {{ $module_ids }} {{ $selenium_options }}'
composer:
early: skip
workdir: ''
shop:
path: 'vendor/oxid-esales/oxideshop-ce'
workdir: 'vendor/oxid-esales/oxideshop-ce'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e TEST_SUITE=/var/www/vendor/oxid-esales/oxideshop-ce/tests -e MODULE_IDS={{ $module_ids }} -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
facts:
path: 'vendor/oxid-esales/oxideshop-facts'
container:
# yamllint disable-line rule:line-length
options: '-e SUITE=vendor/oxid-esales/oxideshop-facts/tests -e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e TEST_SUITE=/var/www/vendor/oxid-esales/oxideshop-ce/tests -e MODULE_IDS={{ $module_ids }} -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e SUITE=vendor/oxid-esales/oxideshop-facts/tests -e XDEBUG_MODE=coverage -e THEME_ID=apex {{ $selenium_options }} {{ $module_ids }}'
gdpr:
path: 'vendor/oxid-esales/gdpr-optin-module'
workdir: 'vendor/oxid-esales/gdpr-optin-module'
Expand All @@ -207,22 +167,20 @@ runscript: &runscript
twig:
path: 'vendor/oxid-esales/twig-component'
workdir: '~'
custom_script: |
cp -a .github/oxid-esales/defaults/scripts/*.sh source/vendor/oxid-esales/twig-component/tests/scripts/
# custom_script: |
# cp -a .github/oxid-esales/defaults/scripts/*.sh source/vendor/oxid-esales/twig-component/tests/scripts/
usercentrics:
path: 'vendor/oxid-professional-services/usercentrics'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e MODULE_IDS={{ $module_ids }} -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e XDEBUG_MODE=coverage -e THEME_ID=apex {{ $selenium_options }} {{ $module_ids }}'
makaira:
path: 'vendor/makaira/oxid-connect-essential'
ddoe_wysiwyg:
path: 'vendor/ddoe/wysiwyg-editor-module'
ddoe_wysiwyg_codeception_twig:
path: 'vendor/ddoe/wysiwyg-editor-module'
container:
# yamllint disable-line rule:line-length
options: '-e XDEBUG_MODE=coverage -e GITHUB_EVENT_NAME={{ .Github.EventName }} -e GITHUB_BASE_REF={{ .Github.BaseRef }} -e GITHUB_REF={{ .Github.Ref }} -e GITHUB_REF_NAME={{ .Github.RefName }} -e THEME_ID=apex -e MODULE_IDS=oegdproptin,oxps_usercentrics,makaira_oxid-connect-essential,ddoewysiwyg -e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome'
options: '-e XDEBUG_MODE=coverage -e THEME_ID=twig {{ $selenium_options }} {{ $module_ids }}'
composer:
early: false
transform: |
Expand Down Expand Up @@ -257,17 +215,9 @@ runscript: &runscript
}
medialibrary:
path: 'vendor/oxid-esales/media-library-module'
eyable:
eyeable:
path: 'vendor/eyeable/eye-able-oxid'

runslim:
<<: *runscript
matrix:
script: |
[
"gdpr:~/php-cs-report.sh"
]
sonarcloud:
matrix:
testplan: 'skip'
Expand Down
Loading

0 comments on commit a89f8fa

Please sign in to comment.