From 9fcbdffe4c945e32c0f90721b0126dbb541b4e1b Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Mon, 11 Jul 2022 17:29:41 +0545 Subject: [PATCH 1/5] Allow plugin bamarni/composer-bin-plugin --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9de39b38ec..05a282bed1 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,10 @@ "platform": { "php": "7.4" }, - "vendor-dir": "./vendor-php" + "vendor-dir": "./vendor-php", + "allow-plugins": { + "bamarni/composer-bin-plugin": true + } }, "require": { }, From bb2a6de576ffa3ed1e9fa1dee357a7e67d5ac49c Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Mon, 11 Jul 2022 17:42:53 +0545 Subject: [PATCH 2/5] allow virtualviews test --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 99f59b975a..3371c0dab2 100644 --- a/.drone.star +++ b/.drone.star @@ -106,7 +106,7 @@ def main(ctx): litmusOcisOldWebdav(), litmusOcisNewWebdav(), litmusOcisSpacesDav(), - #virtualViews(), + virtualViews(), ] + ocisIntegrationTests(6) + s3ngIntegrationTests(12) def buildAndPublishDocker(): From eaf8f30041aa32eb220da044a0bf7ca5eb125d45 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jul 2022 20:47:44 +0545 Subject: [PATCH 3/5] Bump CORE_COMMITID --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index fde4ae50db..f206055d8a 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for API tests -CORE_COMMITID=f1e0bf08b898c7300d4b294c8371f4025d9d99b8 +CORE_COMMITID=9e61886b31671be8cea1f43809bb1a5a826e543c CORE_BRANCH=master From a164c707e8758c4ee3bb7ed57504a52207c7819d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jul 2022 21:18:48 +0545 Subject: [PATCH 4/5] see what composer version is being used --- .drone.star | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.star b/.drone.star index 3371c0dab2..5ff7559faf 100644 --- a/.drone.star +++ b/.drone.star @@ -564,6 +564,7 @@ def virtualViews(): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src", + "composer --version", "make test-acceptance-api", ], "environment": { @@ -796,6 +797,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src/tmp/testrunner", + "composer --version", "make test-acceptance-api", ], "environment": { @@ -871,6 +873,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src/tmp/testrunner", + "composer --version", "make test-acceptance-api", ], "environment": { From 50d3e78cb534da1aa50f40749ecba8be264162d5 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jul 2022 21:32:05 +0545 Subject: [PATCH 5/5] self-update composer in CI --- .drone.star | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.star b/.drone.star index 5ff7559faf..f9b187debd 100644 --- a/.drone.star +++ b/.drone.star @@ -564,6 +564,7 @@ def virtualViews(): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src", + "composer self-update", "composer --version", "make test-acceptance-api", ], @@ -797,6 +798,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src/tmp/testrunner", + "composer self-update", "composer --version", "make test-acceptance-api", ], @@ -873,6 +875,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []): "image": "registry.cern.ch/docker.io/owncloudci/php:7.4", "commands": [ "cd /drone/src/tmp/testrunner", + "composer self-update", "composer --version", "make test-acceptance-api", ],