Move sonobuoy conformance tests into tests directory

Signed-off-by: Derek Nola <[email protected]>
k3s-io · Feb 23, 2024 · 41a8c42 · 41a8c42
1 parent 789e9ff
commit 41a8c42
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/scripts/flaky-tests → tests/docker/flaky-tests b/scripts/flaky-tests → tests/docker/flaky-tests
diff --git a/tests/docker/test-helpers b/tests/docker/test-helpers
@@ -585,7 +585,7 @@ test-run-sonobuoy() {
  fi
 
  cleanup-test-env
- . ./scripts/test-setup-sonobuoy$suffix
+ . ./tests/docker/test-setup-sonobuoy$suffix
 
  if [ "$1" = "parallel" ] || [ "$2" = "parallel" ]; then
  label=PARALLEL \

diff --git a/scripts/test-setup-sonobuoy → tests/docker/test-setup-sonobuoy b/scripts/test-setup-sonobuoy → tests/docker/test-setup-sonobuoy
@@ -19,7 +19,7 @@ test-post-hook() {
  fi
  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
  # Ignore sonobuoy failures if only these flaky tests have failed
- flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
+ flakyFails=$( grep -scF -f ./tests/docker/flaky-tests <<< "$failures" )
  totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )
  [ "$totalFails" -le "$flakyFails" ]
 }

diff --git a/scripts/test-setup-sonobuoy-etcd → tests/docker/test-setup-sonobuoy-etcd b/scripts/test-setup-sonobuoy-etcd → tests/docker/test-setup-sonobuoy-etcd
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./scripts/test-setup-sonobuoy
+. ./tests/docker/test-setup-sonobuoy
 
 export NUM_SERVERS=1
 export NUM_AGENTS=1
@@ -20,7 +20,7 @@ test-post-hook() {
  fi
  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
  # Ignore sonobuoy failures if only these flaky tests have failed
- flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
+ flakyFails=$( grep -scF -f ./tests/docker/flaky-tests <<< "$failures" )
  totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )
  [ "$totalFails" -le "$flakyFails" ]
 }

diff --git a/scripts/test-setup-sonobuoy-mysql → tests/docker/test-setup-sonobuoy-mysql b/scripts/test-setup-sonobuoy-mysql → tests/docker/test-setup-sonobuoy-mysql
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./scripts/test-setup-sonobuoy
+. ./tests/docker/test-setup-sonobuoy
 
 # ---
 
@@ -47,7 +47,7 @@ test-post-hook() {
  fi
  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
  # Ignore sonobuoy failures if only these flaky tests have failed
- flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
+ flakyFails=$( grep -scF -f ./tests/docker/flaky-tests <<< "$failures" )
  totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )
  [ "$totalFails" -le "$flakyFails" ]
 }

diff --git a/scripts/test-setup-sonobuoy-postgres → tests/docker/test-setup-sonobuoy-postgres b/scripts/test-setup-sonobuoy-postgres → tests/docker/test-setup-sonobuoy-postgres
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./scripts/test-setup-sonobuoy
+. ./tests/docker/test-setup-sonobuoy
 
 # ---
 
@@ -47,7 +47,7 @@ test-post-hook() {
  fi
  local failures=$(awk '/^Summarizing .* Failures?:$/,0' "$TEST_DIR/sonobuoy/plugins/e2e/results/global/e2e.log")
  # Ignore sonobuoy failures if only these flaky tests have failed
- flakyFails=$( grep -scF -f ./scripts/flaky-tests <<< "$failures" )
+ flakyFails=$( grep -scF -f ./tests/docker/flaky-tests <<< "$failures" )
  totalFails=$( grep -scF -e "[Fail]" <<< "$failures" )
  [ "$totalFails" -le "$flakyFails" ]
 }