Compare commits

...

5 Commits

Author SHA1 Message Date
Alexandre Lavigne db149e7332
describe error in case of error 2021-10-11 16:10:43 +02:00
Alexandre Lavigne 4d4e3a47a6
update arsenal version 2021-10-11 15:51:41 +02:00
Alexandre Lavigne 017e5d3312
increase ceph 'wait for server to start' timeout to 10 minutes 2021-10-11 15:04:00 +02:00
Alexandre Lavigne c02acbe0bb
increase s3 server 'wait to start' timeout to 10 minutes 2021-10-11 14:14:08 +02:00
Alexandre Lavigne 3cdd0c8c47
test arsenal new version 2021-10-11 11:56:26 +02:00
5 changed files with 18 additions and 11 deletions

View File

@ -2,7 +2,7 @@
version: 0.2 version: 0.2
branches: branches:
feature/*, documentation/*, improvement/*, bugfix/*, w/*, q/*, hotfix/*, dependabot/*: feature/*, documentation/*, improvement/*, bugfix/*, w/*, q/*, hotfix/*, dependabot/*, user/*:
stage: pre-merge stage: pre-merge
models: models:
@ -246,7 +246,7 @@ stages:
bash -c " bash -c "
source /root/.aws/exports &> /dev/null source /root/.aws/exports &> /dev/null
set -ex set -ex
bash wait_for_local_port.bash 8000 40 bash wait_for_local_port.bash 8000 600
yarn run multiple_backend_test yarn run multiple_backend_test
yarn run ft_awssdk_external_backends" yarn run ft_awssdk_external_backends"
<<: *follow-s3-log <<: *follow-s3-log
@ -300,8 +300,8 @@ stages:
source /root/.aws/exports &> /dev/null source /root/.aws/exports &> /dev/null
set -ex set -ex
bash eve/workers/ceph/wait_for_ceph.sh bash eve/workers/ceph/wait_for_ceph.sh
bash wait_for_local_port.bash 27018 40 bash wait_for_local_port.bash 27018 600
bash wait_for_local_port.bash 8000 40 bash wait_for_local_port.bash 8000 600
yarn run multiple_backend_test" yarn run multiple_backend_test"
env: env:
<<: *multiple-backend-vars <<: *multiple-backend-vars

View File

@ -20,7 +20,7 @@
"homepage": "https://github.com/scality/S3#readme", "homepage": "https://github.com/scality/S3#readme",
"dependencies": { "dependencies": {
"@hapi/joi": "^17.1.0", "@hapi/joi": "^17.1.0",
"arsenal": "github:scality/Arsenal#87ba4a7", "arsenal": "github:scality/Arsenal#8.1.2",
"async": "~2.5.0", "async": "~2.5.0",
"aws-sdk": "2.905.0", "aws-sdk": "2.905.0",
"azure-storage": "^2.1.0", "azure-storage": "^2.1.0",

View File

@ -281,7 +281,7 @@ function mpuSetup(location, key, cb) {
}; };
initiateMultipartUpload(authInfo, initiateRequest, log, initiateMultipartUpload(authInfo, initiateRequest, log,
(err, result) => { (err, result) => {
assert.strictEqual(err, null, 'Error initiating MPU'); assert.strictEqual(err, null, `Error initiating MPU, ${err}`);
assertMpuInitResults(result, key, uploadId => { assertMpuInitResults(result, key, uploadId => {
putParts(uploadId, key, () => { putParts(uploadId, key, () => {
cb(uploadId); cb(uploadId);

View File

@ -19,7 +19,7 @@ const incorrectMD5 = 'fkjwelfjlslfksdfsdfsdfsdfsdfsdj';
const objectName = 'objectName'; const objectName = 'objectName';
const date = new Date(); const date = new Date();
const laterDate = date.setMinutes(date.getMinutes() + 30); const laterDate = date.setMinutes(date.getMinutes() + 30);
const earlierDate = date.setMinutes(date.getMinutes() - 30); const earlierDate = date.setMinutes(date.getMinutes() - 60);
const testPutBucketRequest = { const testPutBucketRequest = {
bucketName, bucketName,
namespace, namespace,

View File

@ -675,9 +675,9 @@ arraybuffer.slice@~0.0.7:
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
"arsenal@github:scality/Arsenal#87ba4a7": "arsenal@github:scality/Arsenal#8.1.2":
version "8.2.3" version "8.1.2"
resolved "https://codeload.github.com/scality/Arsenal/tar.gz/87ba4a7b4af866bf099767886ba1d0422253a590" resolved "https://codeload.github.com/scality/Arsenal/tar.gz/3fdfc7196b1f9f0ccfb3cf4ada9e4cf692be4eb7"
dependencies: dependencies:
"@hapi/joi" "^15.1.0" "@hapi/joi" "^15.1.0"
JSONStream "^1.0.0" JSONStream "^1.0.0"
@ -705,7 +705,7 @@ arraybuffer.slice@~0.0.7:
simple-glob "^0.2.0" simple-glob "^0.2.0"
socket.io "~2.3.0" socket.io "~2.3.0"
socket.io-client "~2.3.0" socket.io-client "~2.3.0"
sproxydclient "github:scality/sproxydclient#30e7115" sproxydclient "github:scality/sproxydclient#8.0.2"
utf8 "3.0.0" utf8 "3.0.0"
uuid "^3.0.1" uuid "^3.0.1"
werelogs scality/werelogs#8.1.0 werelogs scality/werelogs#8.1.0
@ -6730,6 +6730,13 @@ sprintf-js@~1.0.2:
async "^3.1.0" async "^3.1.0"
werelogs scality/werelogs#351a2a3 werelogs scality/werelogs#351a2a3
"sproxydclient@github:scality/sproxydclient#8.0.2":
version "8.0.2"
resolved "https://codeload.github.com/scality/sproxydclient/tar.gz/e45c547833f03b1fa0409e0499433dcb386442f5"
dependencies:
async "^3.1.0"
werelogs scality/werelogs#351a2a3
sql-where-parser@~2.2.1: sql-where-parser@~2.2.1:
version "2.2.1" version "2.2.1"
resolved "https://registry.yarnpkg.com/sql-where-parser/-/sql-where-parser-2.2.1.tgz#d9af68c20ebfdffe9a115a119f65abc4fbb7c2e5" resolved "https://registry.yarnpkg.com/sql-where-parser/-/sql-where-parser-2.2.1.tgz#d9af68c20ebfdffe9a115a119f65abc4fbb7c2e5"