Skip to content

Commit 033fd88

Browse files
ctst test replicate object that failed to replicate
Issue: ZENKO-5050
1 parent 2dfce89 commit 033fd88

File tree

4 files changed

+1
-61
lines changed

4 files changed

+1
-61
lines changed

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,6 @@ SORBETD_RESTORE_TIMEOUT=$(kubectl get zenko ${ZENKO_NAME} -o jsonpath='{.spec.so
7878
UTILIZATION_SERVICE_HOST=$(kubectl get zenko ${ZENKO_NAME} -o jsonpath='{.spec.scuba.api.ingress.hostname}')
7979
UTILIZATION_SERVICE_PORT="80"
8080

81-
MONGODB_REPLICASET=$(kubectl get secrets -l app.kubernetes.io/name=connector-cloudserver-config -o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq -r .mongodb.replicaSetHosts)
82-
MONGODB_AUTH_USERNAME=$(kubectl get secrets -l app.kubernetes.io/name=connector-cloudserver-config -o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq -r .mongodb.authCredentials.username)
83-
MONGODB_AUTH_PASSWORD=$(kubectl get secrets -l app.kubernetes.io/name=connector-cloudserver-config -o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq -r .mongodb.authCredentials.password)
84-
MONGODB_DATABASE=$(kubectl get secrets -l app.kubernetes.io/name=connector-cloudserver-config -o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq -r .mongodb.database)
85-
86-
S3_UTILS_TAG=$(yq eval ".s3utils.tag" ../../../solution/deps.yaml)
87-
88-
LOCATION_CONFIGS=$(kubectl get secrets -l app.kubernetes.io/name=connector-cloudserver-config -o jsonpath='{.items[0].data.locationConfig\.json}' | base64 -di | jq -r .)
89-
AWS_REPLICATION_ENDPOINT="http://$(echo "$LOCATION_CONFIGS" | jq -r --arg loc "$AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION" '.[$loc].details.awsEndpoint')"
90-
AWS_REPLICATION_ACCESS_KEY=$(echo "$LOCATION_CONFIGS" | jq -r --arg loc "$AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION" '.[$loc].details.credentials.accessKey')
91-
AWS_REPLICATION_SECRET_KEY=$(echo "$LOCATION_CONFIGS" | jq -r --arg loc "$AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION" '.[$loc].details.credentials.secretKey')
92-
AWS_REPLICATION_LOCATION_TYPE=$(echo "$LOCATION_CONFIGS" | jq -r --arg loc "$AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION" '.[$loc].type')
93-
AWS_REPLICATION_REGION=$(echo "$LOCATION_CONFIGS" | jq -r --arg loc "$AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION" '.[$loc].details.region')
94-
9581
# Setting CTST world params
9682
WORLD_PARAMETERS="$(jq -c <<EOF
9783
{
@@ -142,19 +128,7 @@ WORLD_PARAMETERS="$(jq -c <<EOF
142128
"DRAdminAccessKey":"${DR_ADMIN_ACCESS_KEY_ID}",
143129
"DRAdminSecretKey":"${DR_ADMIN_SECRET_ACCESS_KEY}",
144130
"UtilizationServiceHost":"${UTILIZATION_SERVICE_HOST}",
145-
"UtilizationServicePort":"${UTILIZATION_SERVICE_PORT}",
146-
"AwsBackendDestinationReplicationLocation":"${AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION}",
147-
"AwsReplicationBucketName":"${AWS_REPLICATION_CTST_BUCKET_NAME}",
148-
"AwsReplicationEndpoint":"${AWS_REPLICATION_ENDPOINT}",
149-
"AwsReplicationAccessKey":"${AWS_REPLICATION_ACCESS_KEY}",
150-
"AwsReplicationSecretKey":"${AWS_REPLICATION_SECRET_KEY}",
151-
"AwsReplicationLocationType":"${AWS_REPLICATION_LOCATION_TYPE}",
152-
"AwsReplicationRegion":"${AWS_REPLICATION_REGION}",
153-
"MongodbReplicaSet":"${MONGODB_REPLICASET}",
154-
"MongodbAuthUsername":"${MONGODB_AUTH_USERNAME}",
155-
"MongodbAuthPassword":"${MONGODB_AUTH_PASSWORD}",
156-
"MongodbDatabase":"${MONGODB_DATABASE}",
157-
"S3UtilsTag":"${S3_UTILS_TAG}"
131+
"UtilizationServicePort":"${UTILIZATION_SERVICE_PORT}"
158132
}
159133
EOF
160134
)"

.github/workflows/end2end.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ env:
5757
AWS_BACKEND_SOURCE_LOCATION: awsbackend
5858
AWS_BACKEND_DESTINATION_LOCATION: awsbackendmismatch
5959
AWS_BACKEND_DESTINATION_FAIL_LOCATION: awsbackendfail
60-
<<<<<<< HEAD
6160
AWS_BACKEND_DESTINATION_REPLICATION_FAIL_CTST_LOCATION: awsbackendreplicationctstfail
62-
=======
63-
AWS_BACKEND_DESTINATION_REPLICATION_CTST_LOCATION: awsbackendreplicationctst
64-
>>>>>>> 7325ac24 (add tests for crr existing objects)
6561
GCP_BACKEND_DESTINATION_LOCATION: gcpbackendmismatch
6662
AZURE_BACKEND_DESTINATION_LOCATION: azurebackendmismatch
6763
COLD_BACKEND_DESTINATION_LOCATION: e2e-cold

tests/ctst/features/replicatateExistingObjects.feature

Lines changed: 0 additions & 18 deletions
This file was deleted.

tests/ctst/world/Zenko.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,6 @@ export interface ZenkoWorldParameters extends ClientOptions {
8989
SorbetdRestoreTimeout: string;
9090
UtilizationServiceHost: string;
9191
UtilizationServicePort: string;
92-
AwsBackendDestinationReplicationLocation: string;
93-
AwsReplicationBucketName: string;
94-
AwsReplicationEndpoint: string;
95-
AwsReplicationAccessKey: string;
96-
AwsReplicationSecretKey: string;
97-
AwsReplicationLocationType: string;
98-
AwsReplicationRegion: string;
99-
MongodbReplicaSet: string;
100-
MongodbAuthUsername: string;
101-
MongodbAuthPassword: string;
102-
MongodbDatabase: string;
103-
S3UtilsTag: string;
10492
[key: string]: unknown;
10593
}
10694

0 commit comments

Comments
 (0)