Merge pull request #537 from cyberark/fix-integ-debug

Fix log level in integration tests
cyberark · Jul 20, 2023 · 5c08b58 · 5c08b58
2 parents 3d4feab + 8c3f48e
commit 5c08b58
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/deploy/test/test_cases/TEST_ID_22_helm_rbac_defaults_taken_successfully.sh b/deploy/test/test_cases/TEST_ID_22_helm_rbac_defaults_taken_successfully.sh
@@ -6,7 +6,7 @@ set -euxo pipefail
 setup_helm_environment
 
 pushd ../../
-  export DEBUG="false"
+  export LOG_LEVEL="debug"
   export LABELS="app: test-helm"
   export K8S_SECRETS="test-k8s-secret"
   export CONJUR_ACCOUNT="cucumber"

diff --git a/deploy/test/test_cases/TEST_ID_24_helm_validate_K8S_SECRETS_env_var_incorrect_value.sh b/deploy/test/test_cases/TEST_ID_24_helm_validate_K8S_SECRETS_env_var_incorrect_value.sh
@@ -8,7 +8,7 @@ pushd ../../
   # Install HELM with a K8s Secret that does not exist
   export K8S_SECRETS="K8S_SECRET-non-existent-secret"
   export LABELS="app: test-helm"
-  export DEBUG="true"
+  export LOG_LEVEL="debug"
 
   fill_helm_chart
   helm install -f "../helm/secrets-provider/ci/test-values-$UNIQUE_TEST_ID.yaml" \

diff --git a/deploy/test/test_cases/TEST_ID_25_helm_default_retry_successful.sh b/deploy/test/test_cases/TEST_ID_25_helm_default_retry_successful.sh
@@ -10,7 +10,7 @@ pushd ../../
   export IMAGE_PULL_POLICY="IfNotPresent"
   export TAG="latest"
   export LABELS="app: test-helm"
-  export DEBUG="true"
+  export LOG_LEVEL="debug"
   export K8S_SECRETS="test-k8s-secret"
   export CONJUR_ACCOUNT="cucumber"
   export CONJUR_APPLIANCE_URL="https://conjur-follower.${CONJUR_NAMESPACE_NAME}.svc.cluster.local"

diff --git a/deploy/test/test_cases/TEST_ID_26_helm_override_default_retry_successful.sh b/deploy/test/test_cases/TEST_ID_26_helm_override_default_retry_successful.sh
@@ -6,7 +6,7 @@ setup_helm_environment
 
 pushd ../../
   export LABELS="app: test-helm"
-  export DEBUG="true"
+  export LOG_LEVEL="debug"
   # A parameter that will force a failure
   export CONJUR_AUTHN_URL="https://conjur-follower.${CONJUR_NAMESPACE_NAME}.svc.cluster.local/api/authn-k8s/${AUTHENTICATOR_ID}xyz"  # Configure retry mechanism with overriding defaults
   export RETRY_COUNT_LIMIT="2"

diff --git a/deploy/test/test_in_docker.sh b/deploy/test/test_in_docker.sh
@@ -45,7 +45,7 @@ deployConjur() {
   if [ $CONJUR_DEPLOYMENT = "oss" ]; then
       cmd="$cmd --oss"
   fi
-  runDockerCommand "cd ./kubernetes-conjur-deploy-$UNIQUE_TEST_ID && DEBUG=true $cmd"
+  runDockerCommand "cd ./kubernetes-conjur-deploy-$UNIQUE_TEST_ID && LOG_LEVEL=debug $cmd"
 }
 
 deployTest() {

diff --git a/helm/secrets-provider/ci/test-values-template.yaml b/helm/secrets-provider/ci/test-values-template.yaml
@@ -22,7 +22,7 @@ labels: { {{ LABELS }} }
 annotations: {}
 
 environment:
-  debug: {{ DEBUG }}
+  logLevel: {{ LOG_LEVEL }}
   # Array of Kubernetes Secret names that applications consume, and whose value is sourced in DAP/Conjur.
   # For example, [k8s-secret1,k8s-secret2]
   k8sSecrets: [{{ K8S_SECRETS }}]