From 6e4af4242b65dd943d92a219a716b094bdaf6fdd Mon Sep 17 00:00:00 2001 From: Vlad Podorozhnyi Date: Mon, 13 Nov 2023 20:31:00 +0100 Subject: [PATCH 1/6] Add full integration tests workflow --- .github/workflows/full-integration-tests.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/full-integration-tests.yaml diff --git a/.github/workflows/full-integration-tests.yaml b/.github/workflows/full-integration-tests.yaml new file mode 100644 index 000000000000..10b59cbe5fbf --- /dev/null +++ b/.github/workflows/full-integration-tests.yaml @@ -0,0 +1,13 @@ +name: Integration Tests - Full Test Suite +run-name: ${{ github.actor }} is running Full Integration Test Suite +on: + workflow_dispatch: {} + +jobs: + call-workflow: + name: calling full integration test suite + uses: vpodorozh/github-actions/.github/workflows/full-integration-tests.yaml@full-integration-tests-execution-workflow + secrets: inherit + with: + repository: ${{ github.repository }} + head: ${{ github.sha }} From 95dbf9147bbf9775383e00e2819f5a9229ad9ba2 Mon Sep 17 00:00:00 2001 From: Vlad Podorozhnyi Date: Mon, 13 Nov 2023 20:39:05 +0100 Subject: [PATCH 2/6] Transfer supported services json config for matrix --- .github/supported-services.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/supported-services.json diff --git a/.github/supported-services.json b/.github/supported-services.json new file mode 100644 index 000000000000..55e55c09cf9c --- /dev/null +++ b/.github/supported-services.json @@ -0,0 +1,32 @@ +{ + "services": { + "php": [ + 8.1, + 8.2 + ], + "composer": [ + 2.2 + ], + "database": [ + "mariadb:10.6", + "mysql:8.0" + ], + "search": [ + "elasticsearch:8.4", + "elasticsearch:7.17", + "opensearch:2.5" + ], + "message_queue": [ + null, + "rabbitmq:3.9" + ], + "cache": [ + null, + "redis:7.0" + ], + "http_cache": [ + null, + "varnish:7.1" + ] + } +} \ No newline at end of file From 0aa7ce76269f962bee0c73fa3b316be49b1a97f7 Mon Sep 17 00:00:00 2001 From: Vlad Podorozhnyi Date: Mon, 13 Nov 2023 20:44:24 +0100 Subject: [PATCH 3/6] move suported services json file --- .github/supported-services.json | 32 -------------------------------- supported-services.json | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 .github/supported-services.json diff --git a/.github/supported-services.json b/.github/supported-services.json deleted file mode 100644 index 55e55c09cf9c..000000000000 --- a/.github/supported-services.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "services": { - "php": [ - 8.1, - 8.2 - ], - "composer": [ - 2.2 - ], - "database": [ - "mariadb:10.6", - "mysql:8.0" - ], - "search": [ - "elasticsearch:8.4", - "elasticsearch:7.17", - "opensearch:2.5" - ], - "message_queue": [ - null, - "rabbitmq:3.9" - ], - "cache": [ - null, - "redis:7.0" - ], - "http_cache": [ - null, - "varnish:7.1" - ] - } -} \ No newline at end of file diff --git a/supported-services.json b/supported-services.json index db11fc5c6880..50132b583fb8 100644 --- a/supported-services.json +++ b/supported-services.json @@ -3,6 +3,30 @@ "php": [ 8.1, 8.2 + ], + "composer": [ + 2.2 + ], + "database": [ + "mariadb:10.6", + "mysql:8.0" + ], + "search": [ + "elasticsearch:8.4", + "elasticsearch:7.17", + "opensearch:2.5" + ], + "message_queue": [ + null, + "rabbitmq:3.9" + ], + "cache": [ + null, + "redis:7.0" + ], + "http_cache": [ + null, + "varnish:7.1" ] } } \ No newline at end of file From b8135d5df1d24e59e8f65f8034fa4e735226053b Mon Sep 17 00:00:00 2001 From: Vlad Podorozhnyi Date: Mon, 13 Nov 2023 20:52:13 +0100 Subject: [PATCH 4/6] Minimise support services list --- supported-services.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/supported-services.json b/supported-services.json index 50132b583fb8..705ac8d34a02 100644 --- a/supported-services.json +++ b/supported-services.json @@ -8,25 +8,19 @@ 2.2 ], "database": [ - "mariadb:10.6", "mysql:8.0" ], "search": [ - "elasticsearch:8.4", - "elasticsearch:7.17", - "opensearch:2.5" + "elasticsearch:7.17" ], "message_queue": [ - null, - "rabbitmq:3.9" + null ], "cache": [ - null, "redis:7.0" ], "http_cache": [ - null, - "varnish:7.1" + null ] } } \ No newline at end of file From 789cc7b6ed108be658e7c7da2c1600ad35cf5345 Mon Sep 17 00:00:00 2001 From: Vlad Podorozhnyi Date: Tue, 14 Nov 2023 19:42:15 +0100 Subject: [PATCH 5/6] Upd workflow ref --- .github/workflows/full-integration-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/full-integration-tests.yaml b/.github/workflows/full-integration-tests.yaml index 10b59cbe5fbf..37acdf3b1e65 100644 --- a/.github/workflows/full-integration-tests.yaml +++ b/.github/workflows/full-integration-tests.yaml @@ -6,7 +6,7 @@ on: jobs: call-workflow: name: calling full integration test suite - uses: vpodorozh/github-actions/.github/workflows/full-integration-tests.yaml@full-integration-tests-execution-workflow + uses: mage-os/github-actions/.github/workflows/full-integration-tests.yaml@main secrets: inherit with: repository: ${{ github.repository }} From 207ff6d80a8739b5cc5133778a66f7a60805fcd3 Mon Sep 17 00:00:00 2001 From: Vlad Podorozhnyi Date: Wed, 15 Nov 2023 10:09:43 +0100 Subject: [PATCH 6/6] Update supported services&versions - use rabbitmq and varnish --- supported-services.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supported-services.json b/supported-services.json index 705ac8d34a02..d4678cff391f 100644 --- a/supported-services.json +++ b/supported-services.json @@ -14,13 +14,13 @@ "elasticsearch:7.17" ], "message_queue": [ - null + "rabbitmq:3.9" ], "cache": [ "redis:7.0" ], "http_cache": [ - null + "varnish:7.1" ] } } \ No newline at end of file