Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ZENKO-850): Enable GCP CRR test in eve #231

Merged
merged 1 commit into from
Jul 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions eve/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ stages:
steps:
- Git: *git_pull
- ShellCommand: *private_registry_login
- ShellCommand:
name: Write out GCP key
command: sh gcp_shim.sh
env:
GCP_BACKEND_SERVICE_KEY: '%(secret:gcp_backend_service_key)s'
GCP_BACKEND_SERVICE_EMAIL: '%(secret:gcp_backend_service_email)s'
workdir: build/tests/backbeat
- ShellCommand:
name: build backbeat e2e image
command: docker build -t "$BACKBEAT_DOCKER_IMAGE_NAME:%(prop:commit_short_revision)s" --no-cache .
Expand Down
2 changes: 0 additions & 2 deletions tests/backbeat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ ADD ./ /tests/
WORKDIR /tests
RUN chmod +x gcp_shim.sh
RUN npm install

ENTRYPOINT [ "/tests/gcp_shim.sh" ]
10 changes: 0 additions & 10 deletions tests/backbeat/fix_priv_key.awk

This file was deleted.

9 changes: 2 additions & 7 deletions tests/backbeat/gcp_shim.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
#!/bin/sh

GCP_PRIV_KEY="$(echo $GCP_BACKEND_SERVICE_KEY | base64 -d | awk -f fix_priv_key.awk)"

echo "Converted private key to:"
echo "$GCP_PRIV_KEY"
GCP_BACKEND_SERVICE_KEY="$(echo $GCP_BACKEND_SERVICE_KEY | tr -d '\n')"

cat >gcp_key.json <<EOF
{
"private_key": "${GCP_PRIV_KEY}",
"private_key": "${GCP_BACKEND_SERVICE_KEY}",
"client_email": "${GCP_BACKEND_SERVICE_EMAIL}"
}
EOF

exec $@
6 changes: 3 additions & 3 deletions tests/backbeat/tests/crr/gcpBackend.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const copySource = `/${srcBucket}/${file}`;
const fileutf8 = `${filePrefix}/%EA%9D%8B崰㈌㒈保轖䳷䀰⺩ቆ楪僷ꈅꓜ퇬枅࿷염곞召㸾⌙ꪊᆐ庍뉆䌗↎幐냂詴 끴鹲萯⇂쫤ᛩ꺶㖭簹릍铰᫫暨鿐魪셑蛃춧㡡竺뫁噛̷ᗰⷑ錜⑔痴䧫㾵᏷ำꎆ꼵껪멷㄀誕㳓腜쒃컹㑻鳃삚舿췈孨੦⮀NJ곓⵪꺼꜈嗼뫘悕錸瑺⁤⑬১㵀⡸Ҏ礄䧛졼⮦ٞ쫁퓡厈譤擵泶鵇俻縫륒㜓垻ㆩꝿ詀펉ᆙ舑䜾힑藪碙ꀎꂰ췊Ᏻ 㘺幽醛잯ද汧Ꟑꛒⶨ쪸숞헹㭔ꡔᘼ뺓ᡆ᡾ᑟ䅅퀭耓弧⢠⇙폪ް蛧⃪Ἔ돫ꕢ븥ヲ캂䝄쟐颺ᓾ둾Ұ껗礞ᾰ瘹蒯硳풛瞋襎奺熝妒컚쉴⿂㽝㝳駵鈚䄖戭䌸᫲ᇁ䙪鸮ᐴ稫ⶭ뀟ھ⦿䴳稉ꉕ捈袿놾띐✯伤䃫⸧ꠏ瘌틳藔ˋ㫣敀䔩㭘식↴⧵佶痊牌ꪌ搒꾛æᤈべ쉴挜炩⽍舘ꆗ줣徭Z䐨 敗羥誜嘳ֶꫜ걵ࣀ묟ኋ拃秷䨸菥䟆곘縧멀煣⧃⏶혣뎧邕⢄⭖陙䣎灏ꗛ僚䌁䠒䲎둘ꪎ傩쿌ᨌ뀻阥눉넠猌ㆯ㰢船戦跏灳蝒礯鞰諾벥煸珬㟑孫鞹Ƭꄹ孙ꢱ钐삺ᓧ鈠䁞〯蘼᫩헸ῖ"`; // eslint-disable-line
const REPLICATION_TIMEOUT = 300000;

describe.skip('Replication with GCP backend', function() {
describe('Replication with GCP backend', function() {
this.timeout(REPLICATION_TIMEOUT);
let roleArn = 'arn:aws:iam::root:role/s3-replication-role';

Expand Down Expand Up @@ -65,7 +65,7 @@ describe.skip('Replication with GCP backend', function() {

// GCP MPUs are limited to 1024 parts, so check that we can still replicate
// and source MPU that is greater than 1024 parts.
it('should replicate a MPU object: 1025 parts', done => series([
it.skip('should replicate a MPU object: 1025 parts', done => series([
next => utils.completeMPUGCP(srcBucket, file, 1025, next),
next => utils.compareObjectsGCP(srcBucket, destBucket, file, next),
], done));
Expand All @@ -81,7 +81,7 @@ describe.skip('Replication with GCP backend', function() {
next => utils.compareObjectsGCP(srcBucket, destBucket, file, next),
], done)));

it('should delete the destination object when putting a delete marker on ' +
it.skip('should delete the destination object when putting a delete marker on ' +
'the source object', done => series([
next => utils.putObject(srcBucket, file, Buffer.alloc(1), next),
next => utils.compareObjectsGCP(srcBucket, destBucket, file, next),
Expand Down