Merge branches 'w/9.1/improvement/CLDSRV-717-unify-tests' and 'q/w/5920/9.0/improvement/CLDSRV-717-unify-tests' into tmp/octopus/q/9.1

Author: bert-e

tests/functional/aws-node-sdk/test/bucket/putBucketReplication.js

@@ -126,7 +126,10 @@ describe('aws-node-sdk test putBucketReplication bucket status', () => {
         it('should put configuration on a bucket with versioning', done =>
             checkVersioningError(s3, 'Enabled', null, done));
 
-        it('should put configuration on a bucket with versioning if ' +
+        // S3C doesn't support service account. There is no cross account access for replication account.
+        // (canonicalId looking like http://acs.zenko.io/accounts/service/replication)
+        const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
+        itSkipS3C('should put configuration on a bucket with versioning if ' +
         'user is a replication user', done =>
             checkVersioningError(replicationAccountS3, 'Enabled', null, done));
     });

tests/functional/aws-node-sdk/test/bucket/testBucketVersioning.js

@@ -145,7 +145,10 @@ describe('aws-node-sdk test bucket versioning', function testSuite() {
         s3.putBucketVersioning(params, done);
     });
 
-    it('should accept valid versioning configuration if user is a ' +
+    // S3C doesn't support service account. There is no cross account access for replication account.
+    // (canonicalId looking like http://acs.zenko.io/accounts/service/replication)
+    const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
+    itSkipS3C('should accept valid versioning configuration if user is a ' +
     'replication user', done => {
         const params = {
             Bucket: bucket,

tests/functional/aws-node-sdk/test/object/copyPart.js

@@ -711,7 +711,9 @@ describe('Object Part Copy', () => {
                 });
             });
 
-        it('should not copy a part of a cold object', done => {
+        // S3C doesn't support cold storage and restore
+        const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
+        itSkipS3C('should not copy a part of a cold object', done => {
             const archive = {
                 archiveInfo: {
                     archiveId: '97a71dfe-49c1-4cca-840a-69199e0b0322',
@@ -734,7 +736,7 @@ describe('Object Part Copy', () => {
             });
         });
 
-        it('should copy a part of an object when it\'s transitioning to cold', done => {
+        itSkipS3C('should copy a part of an object when it\'s transitioning to cold', done => {
             fakeMetadataTransition(sourceBucketName, sourceObjName, undefined, err => {
                 assert.ifError(err);
                 s3.uploadPartCopy({
@@ -752,7 +754,7 @@ describe('Object Part Copy', () => {
             });
         });
 
-        it('should copy a part of a restored object', done => {
+        itSkipS3C('should copy a part of a restored object', done => {
             const archiveCompleted = {
                 archiveInfo: {},
                 restoreRequestedAt: new Date(0),

tests/functional/aws-node-sdk/test/object/mpuVersion.js

@@ -102,7 +102,7 @@ function checkObjMdAndUpdate(objMDBefore, objMDAfter, props) {
 
 // TODO: CLDSRV-721 RING 10 Support ObjectRestore (cold storage) with MD v1
 // The whole test suite is skipped as bad versionId breaks after each bucket cleanup
-const describeSkipNullMdV1 = isNullKeyMetadataV1 ? describe.skip : describe;
+const describeSkipNullMdV1 = isNullKeyMetadataV1 || process.env.S3_END_TO_END ? describe.skip : describe;
 
 describeSkipNullMdV1('MPU with x-scal-s3-version-id header', () => {
     withV4(sigCfg => {

tests/functional/aws-node-sdk/test/object/objectHead_replication.js

@@ -45,10 +45,13 @@ describe("Head object 'ReplicationStatus' value", () => {
             done => checkHeadObj(`${keyPrefix}-foobar`, undefined, done));
 
         describe('With bucket replication config', () => {
+            const role = process.env.S3_END_TO_END
+            ? 'arn:aws:iam::123456789012:role/src-resource,arn:aws:iam::123456789012:role/dest-resource'
+            : 'arn:aws:iam::123456789012:role/src-resource';
             beforeEach(done => s3.putBucketReplication({
                 Bucket: sourceBucket,
                 ReplicationConfiguration: {
-                    Role: 'arn:aws:iam::123456789012:role/src-resource',
+                    Role: role,
                     Rules: [
                         {
                             Destination: { StorageClass: 'us-east-2',

tests/functional/aws-node-sdk/test/object/putVersion.js

@@ -53,7 +53,7 @@ function checkObjMdAndUpdate(objMDBefore, objMDAfter, props) {
 
 // TODO: CLDSRV-721 RING 10 Support ObjectRestore (cold storage) with MD v1
 // The whole test suite is skipped as bad versionId breaks after each bucket cleanup
-const describeSkipNullMdV1 = isNullKeyMetadataV1 ? describe.skip : describe;
+const describeSkipNullMdV1 = isNullKeyMetadataV1 || process.env.S3_END_TO_END ? describe.skip : describe;
 
 describeSkipNullMdV1('PUT object with x-scal-s3-version-id header', () => {
     withV4(sigCfg => {