From 1373d02792953ab51b395ef3fae55dcd2007dc3d Mon Sep 17 00:00:00 2001 From: pwengerter Date: Thu, 2 Sep 2021 17:42:49 +0100 Subject: [PATCH] Bump commit IDs & core img with node14 & update cypress in CI yarn command --- .drone.env | 4 ++-- .drone.star | 4 ++-- tests/acceptance/run.sh | 2 +- yarn.lock | 12 ++++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.drone.env b/.drone.env index 3340a88f603..8fca5da4328 100644 --- a/.drone.env +++ b/.drone.env @@ -1,7 +1,7 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=45bd133a706ea031f905a159184e6fdb63faa885 +OCIS_COMMITID=a07c1e77a0a3bcb10b109ea4b468472cea10fbb3 OCIS_BRANCH=master # The test runner source for API tests -CORE_COMMITID=08e27f0d73bca5352d87b42936d6d956bc0eaea5 +CORE_COMMITID=d2d63df18170e5e62dbc4d77492ba9a9156af80e CORE_BRANCH=master diff --git a/.drone.star b/.drone.star index 5fda8442c13..4390214c2ac 100644 --- a/.drone.star +++ b/.drone.star @@ -1505,7 +1505,7 @@ def installCore(version, db): stepDefinition = { "name": "install-core", - "image": "owncloudci/core", + "image": "owncloudci/core:nodejs14", "pull": "always", } @@ -1553,7 +1553,7 @@ def installFederatedServer(version, db, dbSuffix = "-federated"): stepDefinition = { "name": "install-federated", - "image": "owncloudci/core", + "image": "owncloudci/core:nodejs14", "pull": "always", } if version: diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index 1be21b08d6e..79a5b8fab25 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -161,7 +161,7 @@ then TEST_PATHS+=( "${FEATURES_DIR}" ) fi -RUN_ACCEPTANCE_TESTS="cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format node_modules/cucumber-pretty" +RUN_ACCEPTANCE_TESTS="CUCUMBER_PUBLISH_ENABLED=false cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require tests/acceptance/setup.js --require tests/acceptance/stepDefinitions --format @cucumber/pretty-formatter" if [ -z "${TEST_TAGS}" ] then diff --git a/yarn.lock b/yarn.lock index 2e58e52a700..098fd87b802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12260,6 +12260,18 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yazl@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35" + integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw== + dependencies: + buffer-crc32 "~0.2.3" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + zip-stream@^2.1.2: version "2.1.3" resolved "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz"