remove unset TEST_NAMESPACE

Signed-off-by: ryanohnemus <[email protected]>
fluent · Feb 5, 2024 · 4398fae · 4398fae
1 parent 0cb622f
commit 4398fae
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 13 deletions.
diff --git a/tests/chunk-rollover/basic.bats b/tests/chunk-rollover/basic.bats
@@ -25,7 +25,6 @@ teardown_file() {
         run kubectl delete namespace "$TEST_NAMESPACE"
         rm -f ${HELM_VALUES_EXTRA_FILE}
     fi
-    unset TEST_NAMESPACE
 }
 
 function teardown() {
@@ -68,7 +67,7 @@ DETIK_CLIENT_NAMESPACE="${TEST_NAMESPACE}"
 
     COUNTER=0
 
-    kubectl wait pods -n "$TEST_NAMESPACE" -l app.kubernetes.io/name=fluent-bit --for condition=Ready --timeout=30s
+    kubectl wait pods -n "$TEST_NAMESPACE" -l app.kubernetes.io/name=fluent-bit --for condition=Ready --timeout=60s
 
     while [ $COUNTER -lt $TOTAL_TIME ]; do
         # Get the number of Fluent Bit DaemonSet pods that are not in the "Running" status

diff --git a/tests/elasticsearch/basic.bats b/tests/elasticsearch/basic.bats
@@ -26,7 +26,6 @@ teardown_file() {
         run kubectl delete namespace "$TEST_NAMESPACE"
         rm -f ${HELM_VALUES_EXTRA_FILE}
     fi
-    unset TEST_NAMESPACE
 }
 
 # These are required for bats-detik

diff --git a/tests/elasticsearch/compress.bats b/tests/elasticsearch/compress.bats
@@ -26,7 +26,6 @@ teardown_file() {
         run kubectl delete namespace "$TEST_NAMESPACE"
         rm -f ${HELM_VALUES_EXTRA_FILE}
     fi
-    unset TEST_NAMESPACE
 }
 
 # These are required for bats-detik

diff --git a/tests/kubernetes-plugins/basic.bats b/tests/kubernetes-plugins/basic.bats
@@ -44,7 +44,6 @@ teardown_file() {
         run kubectl delete namespace "$TEST_NAMESPACE"
         rm -f ${HELM_VALUES_EXTRA_FILE}
     fi
-    unset TEST_NAMESPACE
 }
 
 setup() {

diff --git a/tests/kubernetes-plugins/full.bats b/tests/kubernetes-plugins/full.bats
@@ -54,7 +54,6 @@ teardown_file() {
         run kubectl delete namespace "$TEST_NAMESPACE"
         rm -f ${HELM_VALUES_EXTRA_FILE}
     fi
-    unset TEST_NAMESPACE
 }
 
 setup() {

diff --git a/tests/opensearch/basic.bats b/tests/opensearch/basic.bats
@@ -26,7 +26,6 @@ function teardown_file() {
         run kubectl delete namespace "$TEST_NAMESPACE"
         rm -f ${HELM_VALUES_EXTRA_FILE}
     fi
-    unset TEST_NAMESPACE
 }
 
 function teardown() {
@@ -79,7 +78,7 @@ DETIK_CLIENT_NAMESPACE="${TEST_NAMESPACE}"
     try "at most 15 times every 2s " \
         "to find 1 pods named 'fluent-bit' " \
         "with 'status' being 'running'"
-        
+
     attempt=0
     while true; do
     	run kubectl exec -q -n $TEST_NAMESPACE opensearch-cluster-master-0 -- curl --insecure -s -w "%{http_code}" https://admin:admin@localhost:9200/fluentbit/_search/ -o /dev/null

diff --git a/tests/opensearch/hosted.bats b/tests/opensearch/hosted.bats
@@ -12,6 +12,9 @@ load "$BATS_ASSERT_ROOT/load.bash"
 load "$BATS_FILE_ROOT/load.bash"
 
 setup_file() {
+    if [[ $HOSTED_OPENSEARCH_HOST == "localhost" ]]; then
+        skip "Skipping Hosted OpenSearch When 'HOSTED_OPENSEARCH_HOST=localhost'"
+    fi
     export TEST_NAMESPACE=${TEST_NAMESPACE:-opensearch-hosted}
     echo "recreating namespace $TEST_NAMESPACE"
     run kubectl delete namespace "$TEST_NAMESPACE"
@@ -28,7 +31,6 @@ teardown_file() {
             rm -f ${BATS_TEST_DIRNAME}/resources/helm/fluentbit-hosted.yaml
         fi
     fi
-    unset TEST_NAMESPACE
 }
 
 function teardown() {
@@ -45,10 +47,6 @@ DETIK_CLIENT_NAMESPACE="${TEST_NAMESPACE}"
 
 
 @test "test fluent-bit forwards logs to AWS OpenSearch hosted service default index" {
-    if [[ $HOSTED_OPENSEARCH_HOST == "localhost" ]]; then
-        skip "Skipping Hosted OpenSearch When 'HOSTED_OPENSEARCH_HOST=localhost'"
-    fi
-
     envsubst < "${BATS_TEST_DIRNAME}/resources/helm/fluentbit-hosted.yaml.tpl" > "${BATS_TEST_DIRNAME}/resources/helm/fluentbit-hosted.yaml"
 
     helm upgrade --install --debug --create-namespace --namespace "$TEST_NAMESPACE" fluent-bit fluent/fluent-bit \