From 4e479c436bdd870d17323affc8918178de42ad90 Mon Sep 17 00:00:00 2001 From: KillianG Date: Fri, 31 May 2024 14:37:53 +0200 Subject: [PATCH] Place config in zenko.yml instead of patch it in configuration to avoid reconcile Issue: ZENKO-4805 --- .github/scripts/end2end/configs/zenko.yaml | 7 ++++++- .github/scripts/end2end/configure-e2e-ctst.sh | 9 --------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/scripts/end2end/configs/zenko.yaml b/.github/scripts/end2end/configs/zenko.yaml index e4b5ae0a9..93566ce1d 100644 --- a/.github/scripts/end2end/configs/zenko.yaml +++ b/.github/scripts/end2end/configs/zenko.yaml @@ -101,6 +101,11 @@ spec: e2e-cold: debug: "true" command-timeout: "60s" + pending-job-poll-after-age: "10s" + pending-job-poll-check-interval: "10s" + e2e-azure-archive: + pending-job-poll-after-age: "10s" + pending-job-poll-check-interval: "10s" server: tar: targetSize: 10KB @@ -108,7 +113,7 @@ spec: maxDelay: "5s" azure: archiveTier: "hot" - pollingDelay: "1s" + restoreTimeout: "15s" ingress: workloadPlaneClass: 'nginx' controlPlaneClass: 'nginx' diff --git a/.github/scripts/end2end/configure-e2e-ctst.sh b/.github/scripts/end2end/configure-e2e-ctst.sh index f246daeb6..9084153b9 100755 --- a/.github/scripts/end2end/configure-e2e-ctst.sh +++ b/.github/scripts/end2end/configure-e2e-ctst.sh @@ -21,15 +21,6 @@ kubectl wait --for condition=DeploymentInProgress=true --timeout 10m zenko/${ZEN kubectl wait --for condition=DeploymentFailure=false --timeout 10m zenko/${ZENKO_NAME} kubectl wait --for condition=DeploymentInProgress=false --timeout 10m zenko/${ZENKO_NAME} -# Patch sorbet env -kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-azure-archive":{"pending-job-poll-after-age":"10s"}}}}}' -kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-azure-archive":{"pending-job-poll-check-interval":"10s"}}}}}' - -kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-cold":{"pending-job-poll-after-age":"10s"}}}}}' -kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"configurationOverrides":{"e2e-cold":{"pending-job-poll-check-interval":"10s"}}}}}' - -kubectl patch zenko $ZENKO_NAME --type merge -p '{"spec":{"sorbet":{"server":{"azure":{"restoreTimeout":"15s"}}}}}' - # Get kafka image name and tag KAFKA_REGISTRY_NAME=$(yq eval ".kafka.sourceRegistry" ../../../solution/deps.yaml) KAFKA_IMAGE_NAME=$(yq eval ".kafka.image" ../../../solution/deps.yaml)