diff --git a/.drone.star b/.drone.star index dfac3544ebe..4d0506de12d 100644 --- a/.drone.star +++ b/.drone.star @@ -85,13 +85,13 @@ S3_PUBLIC_CACHE_BUCKET = "public" # configuration config = { "cs3ApiTests": { - "skip": False, + "skip": True, }, "wopiValidatorTests": { - "skip": False, + "skip": True, }, "k6LoadTests": { - "skip": False, + "skip": True, }, "localApiTests": { "contractAndLock": { @@ -130,7 +130,7 @@ config = { ], "skip": False, "withRemotePhp": [False], - "k8s": False, + "k8s": True, }, "spaces": { "suites": [ @@ -155,7 +155,7 @@ config = { "apiArchiver", "apiActivities", ], - "skip": False, + "skip": True, }, "groupAndSearch1": { "suites": [ @@ -164,7 +164,7 @@ config = { "apiGraphGroup", "apiServiceAvailability", ], - "skip": False, + "skip": True, "k8s": False, }, "search2": { @@ -173,7 +173,7 @@ config = { "apiSearchContent", ], "tikaNeeded": True, - "skip": False, + "skip": True, "k8s": False, }, "sharingNg1": { @@ -215,7 +215,7 @@ config = { "suites": [ "apiAntivirus", ], - "skip": False, + "skip": True, "antivirusNeeded": True, "extraServerEnvironment": { "ANTIVIRUS_SCANNER_TYPE": "clamav", @@ -228,7 +228,7 @@ config = { "ocmAndAuthApp": { "suites": [ "apiOcm", - "apiAuthApp", + # "apiAuthApp", ], "skip": False, "withRemotePhp": [False], @@ -347,7 +347,7 @@ config = { "coreApiWebdavOperations", "coreApiWebdavMove2", ], - "skip": False, + "skip": True, }, "7": { "suites": [ @@ -363,29 +363,29 @@ config = { "coreApiWebdavUpload", "coreApiWebdavUploadTUS", ], - "skip": False, + "skip": True, }, }, "e2eTests": { "part": { - "skip": False, + "skip": True, "totalParts": 4, # divide and run all suites in parts (divide pipelines) "xsuites": ["search", "app-provider", "oidc", "ocm", "keycloak"], # suites to skip }, "search": { - "skip": False, + "skip": True, "suites": ["search"], # suites to run "tikaNeeded": True, }, "keycloak": { - "skip": False, + "skip": True, "suites": ["journeys", "keycloak"], "keycloakNeeded": True, }, }, "e2eMultiService": { "testSuites": { - "skip": False, + "skip": True, "suites": [ "smoke", "shares", @@ -1091,7 +1091,7 @@ def localApiTestPipeline(ctx): params[item] = matrix[item] if item in matrix else defaults[item] for storage in params["storages"]: for run_with_remote_php in params["withRemotePhp"]: - run_on_k8s = params["k8s"] and ctx.build.event == "cron" + run_on_k8s = params["k8s"] #and ctx.build.event == "cron" ocis_url = OCIS_URL if run_on_k8s: ocis_url = "https://%s" % OCIS_SERVER_NAME @@ -1393,7 +1393,7 @@ def coreApiTestPipeline(ctx): for run_with_remote_php in params["withRemotePhp"]: filter_tags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage" % ("OC" if storage == "owncloud" else "OCIS") expected_failures_file = "%s/expected-failures-API-on-%s-storage.md" % (test_dir, storage.upper()) - run_on_k8s = params["k8s"] and ctx.build.event == "cron" + run_on_k8s = params["k8s"] #and ctx.build.event == "cron" ocis_url = OCIS_URL if run_on_k8s: ocis_url = "https://%s" % OCIS_SERVER_NAME @@ -3501,7 +3501,7 @@ def apiTestFailureLog(): "name": "api-test-failure-logs", "image": OC_CI_PHP % DEFAULT_PHP_VERSION, "commands": [ - "cat %s/tests/acceptance/logs/failed.log" % dirs["base"], + # "cat %s/tests/acceptance/logs/failed.log" % dirs["base"], ], "when": { "status": [ @@ -3614,7 +3614,7 @@ def waitForOcis(name = "ocis", ocis_url = OCIS_URL, depends_on = []): "image": OC_CI_ALPINE, "commands": [ # wait for ocis-server to be ready (5 minutes) - "timeout 300 bash -c 'while [ $(curl -sk -uadmin:admin " + + "timeout 600 bash -c 'while [ $(curl -sk -uadmin:admin " + "%s/graph/v1.0/users/admin " % ocis_url + "-w %{http_code} -o /dev/null) != 200 ]; do sleep 1; done'", ], @@ -3777,6 +3777,7 @@ def k3sCluster(): "user": "root", "privileged": True, "commands": [ + "rm -rf ocis-charts", "git clone --single-branch --branch main --depth 1 https://github.com/owncloud/ocis-charts.git", "nohup dockerd-entrypoint.sh &", "until docker ps 2>&1 > /dev/null; do sleep 1s; done", @@ -3836,6 +3837,27 @@ def deployOcis(): ], }] +def deployFedOcis(): + return [{ + "name": "deploy-ocis", + "image": "ghcr.io/helmfile/helmfile:v0.156.0", + "commands": [ + "cd ocis-charts", + "cp deployments/ocm-install/helmfile.yaml deployments/ocm-install/helmfile.yaml.gotmpl", + "helmfile sync", + ], + "volumes": [ + { + "name": "gopath", + "path": "/go", + }, + ], + "extra_hosts": [ + "myservice.local:192.168.1.100", + "another.local:10.0.0.5", + ], + }] + def clamavServiceK8s(): return [{ "name": "clamav", @@ -3901,7 +3923,7 @@ def waitForOciswrapper(url = "http://ociswrapper:5200", depends_on = []): "name": "wait-for-wrapper", "image": OC_CI_ALPINE, "commands": [ - "timeout 60 bash -c 'while [ $(curl -sk " + + "timeout 600 bash -c 'while [ $(curl -sk " + "%s " % url + "-w %{http_code} -o /dev/null) != 404 ]; do sleep 1; done'", ],