Skip to content

Commit 9597b0c

Browse files
codespace: disable gcp tests
These tests require external setup, disable in codespace (and only there!) for now. Issue: ZENKO-5096
1 parent b547b50 commit 9597b0c

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.devcontainer/setup.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ env_variables=$(yq eval '.env | to_entries | .[] | .key + "=" + .value' .github/
66
export GIT_ACCESS_TOKEN=${GITHUB_TOKEN}
77
export E2E_IMAGE_TAG=latest
88

9+
# Disable GCP tests as we don't have credentials setup in devcontainer
10+
export GCP_BACKEND_DESTINATION_LOCATION=
11+
912
GITHUB_ENV=$(mktemp /tmp/github_env.XXXXXX)
1013

1114
for input in $(yq '.inputs | to_entries | .[] | .key + "=" + .value.default' .github/actions/deploy/action.yaml); do
@@ -52,8 +55,9 @@ done
5255
yq -i 'del(.locations[] | select(.locationType == "location-scality-ring-s3-v1"))' e2e-config.yaml
5356
fi
5457

55-
# Disable GCP tests as we don't have credentials setup in devcontainer
56-
yq -i 'del(.locations[] | select(.locationType == "location-gcp-v1"))' e2e-config.yaml
58+
if [ -z "$GCP_BACKEND_DESTINATION_LOCATION" ]; then
59+
yq -i 'del(.locations[] | select(.locationType == "location-gcp-v1"))' e2e-config.yaml
60+
fi
5761

5862
docker build -t $E2E_IMAGE_NAME:$E2E_IMAGE_TAG .
5963
kind load docker-image ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG}

.github/scripts/end2end/run-e2e-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ run_e2e_test() {
8686
--env=AWS_BACKEND_SOURCE_LOCATION=${AWS_BACKEND_SOURCE_LOCATION} \
8787
--env=AWS_BACKEND_DESTINATION_LOCATION=${AWS_BACKEND_DESTINATION_LOCATION} \
8888
--env=AWS_S3_FAIL_BACKEND_DESTINATION_LOCATION=${AWS_BACKEND_DESTINATION_FAIL_LOCATION} \
89-
--env=GCP_BACKEND_DESTINATION_LOCATION=${GCP_BACKEND_DESTINATION_LOCATION} \
89+
--env=GCP_BACKEND_DESTINATION_LOCATION=${GCP_BACKEND_DESTINATION_LOCATION:-} \
9090
--env=AZURE_BACKEND_DESTINATION_LOCATION=${AZURE_BACKEND_DESTINATION_LOCATION} \
9191
--env=COLD_BACKEND_DESTINATION_LOCATION=${COLD_BACKEND_DESTINATION_LOCATION} \
9292
--env=AZURE_ARCHIVE_BACKEND_DESTINATION_LOCATION=${AZURE_ARCHIVE_BACKEND_DESTINATION_LOCATION} \

tests/zenko_tests/node_tests/backbeat/tests/crr/gcpBackend.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ const fileutf8 = `${filePrefix}/%EA%9D%8B崰㈌㒈保轖䳷䀰⺩ቆ楪僷ꈅꓜ
2222
const REPLICATION_TIMEOUT = 300000;
2323

2424
describe('Replication with GCP backend', function () {
25+
if (!process.env.GCP_BACKEND_DESTINATION_LOCATION) {
26+
this.skip();
27+
}
28+
2529
this.timeout(REPLICATION_TIMEOUT);
2630
this.retries(3);
2731
const roleArn = 'arn:aws:iam::root:role/s3-replication-role';

0 commit comments

Comments
 (0)