Skip to content

Commit de6b92a

Browse files
author
Kerkesni
committed
include gc topic in sorbetctl command
1 parent 0f1e00c commit de6b92a

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ KAFKA_DEAD_LETTER_TOPIC=$(kubectl get secret -l app.kubernetes.io/name=cold-sorb
4848

4949
KAFKA_OBJECT_TASK_TOPIC=$(kubectl get secret -l app.kubernetes.io/name=cold-sorbet-config-e2e-azure-archive,app.kubernetes.io/instance=end2end \
5050
-o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq '."kafka-object-task-topic"' | cut -d "\"" -f 2)
51+
52+
KAFKA_GC_REQUEST_TOPIC=$(kubectl get secret -l app.kubernetes.io/name=cold-sorbet-config-e2e-azure-archive,app.kubernetes.io/instance=end2end \
53+
-o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq '."kafka-gc-request-topic"' | cut -d "\"" -f 2)
5154

5255
DR_ADMIN_ACCESS_KEY_ID=$(kubectl get secret end2end-pra-management-vault-admin-creds.v1 -o jsonpath='{.data.accessKey}' | base64 -d)
5356
DR_ADMIN_SECRET_ACCESS_KEY=$(kubectl get secret end2end-pra-management-vault-admin-creds.v1 -o jsonpath='{.data.secretKey}' | base64 -d)
@@ -110,6 +113,7 @@ WORLD_PARAMETERS="$(jq -c <<EOF
110113
"AzureArchiveQueue":"${AZURE_ARCHIVE_QUEUE_NAME}",
111114
"TimeProgressionFactor":"${TIME_PROGRESSION_FACTOR}",
112115
"KafkaObjectTaskTopic":"${KAFKA_OBJECT_TASK_TOPIC}",
116+
"KafkaGCRequestTopic":"${KAFKA_GC_REQUEST_TOPIC}",
113117
"KafkaDeadLetterQueueTopic":"${KAFKA_DEAD_LETTER_TOPIC}",
114118
"InstanceID":"${INSTANCE_ID}",
115119
"BackbeatApiHost":"${BACKBEAT_API_HOST}",

tests/ctst/steps/azureArchive.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ When('i run sorbetctl to retry failed restore for {string} location', async func
361361
const command = `/ctst/sorbetctl forward list failed --trigger-retry --skip-invalid \
362362
--kafka-dead-letter-topic=${this.parameters.KafkaDeadLetterQueueTopic} \
363363
--kafka-object-task-topic=${this.parameters.KafkaObjectTaskTopic} \
364+
--kafka-gc-request-topic=${this.parameters.KafkaGCRequestTopic} \
364365
--kafka-brokers ${this.parameters.KafkaHosts}`;
365366
try {
366367
this.logger.debug('Running command', { command, location });

tests/ctst/world/Zenko.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export interface ZenkoWorldParameters extends ClientOptions {
8181
TimeProgressionFactor: number;
8282
KafkaDeadLetterQueueTopic: string;
8383
KafkaObjectTaskTopic: string;
84+
KafkaGCRequestTopic: string;
8485
InstanceID: string;
8586
BackbeatApiHost: string;
8687
BackbeatApiPort: string;

0 commit comments

Comments
 (0)