directory structure

kubernetes · Jan 26, 2025 · de66b56 · de66b56
1 parent 9652ffc
commit de66b56
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...mender/ignored-vpa-object-namespaces.yaml → ...deploy/ignored-vpa-object-namespaces.yaml b/...mender/ignored-vpa-object-namespaces.yaml → ...deploy/ignored-vpa-object-namespaces.yaml
diff --git a/...loy/recommender/vpa-object-namespace.yaml → ...ommender/deploy/vpa-object-namespace.yaml b/...loy/recommender/vpa-object-namespace.yaml → ...ommender/deploy/vpa-object-namespace.yaml
diff --git a/...ommender/ignored-vpa-object-namespaces.sh → ...ommender/ignored-vpa-object-namespaces.sh b/...ommender/ignored-vpa-object-namespaces.sh → ...ommender/ignored-vpa-object-namespaces.sh
@@ -18,13 +18,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../../../..
+SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../../..
 
 export REGISTRY=${REGISTRY:-localhost:5001}
 export TAG=${TAG:-latest}
 
 
-REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/deploy/recommender/ignored-vpa-object-namespaces.yaml | kubectl apply -f -
+REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/recommender/deploy/ignored-vpa-object-namespaces.yaml | kubectl apply -f -
 
 CHECK_CYCLES=15
 CHECK_SLEEP=15
@@ -69,4 +69,4 @@ fi
 
 echo "Verified ignored namespaces are still not tracked after wait time!"
 
-REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/deploy/recommender/ignored-vpa-object-namespaces.yaml | kubectl delete -f -
+REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/recommender/deploy/ignored-vpa-object-namespaces.yaml | kubectl delete -f -
diff --git a/...eploy/recommender/vpa-object-namespace.sh → ...tests/recommender/vpa-object-namespace.sh b/...eploy/recommender/vpa-object-namespace.sh → ...tests/recommender/vpa-object-namespace.sh
@@ -18,13 +18,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../../../..
+SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../../..
 
 export REGISTRY=${REGISTRY:-localhost:5001}
 export TAG=${TAG:-latest}
 
 
-REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/deploy/recommender/vpa-object-namespace.yaml | kubectl apply -f -
+REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/recommender/deploy/vpa-object-namespace.yaml | kubectl apply -f -
 
 CHECK_CYCLES=15
 CHECK_SLEEP=15
@@ -69,4 +69,4 @@ fi
 
 echo "Verified ignored namespaces are still not tracked after wait time!"
 
-REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/deploy/recommender/vpa-object-namespace.yaml | kubectl delete -f -
+REGISTRY=${REGISTRY} TAG=${TAG} ${SCRIPT_ROOT}/hack/vpa-process-yaml.sh ${SCRIPT_ROOT}/hack/integration-tests/recommender/deploy/vpa-object-namespace.yaml | kubectl delete -f -
diff --git a/vertical-pod-autoscaler/hack/integration-tests/run-integration-locally.sh b/vertical-pod-autoscaler/hack/integration-tests/run-integration-locally.sh
@@ -113,7 +113,7 @@ case ${SUITE} in
 
     echo " ** Running suite ${SUITE}"
 
-    ASSERTION_SCRIPTS=$(find "${SCRIPT_ROOT}/hack/integration-tests/deploy/${SUITE}" -name "*.sh" -type f | sort)
+    ASSERTION_SCRIPTS=$(find "${SCRIPT_ROOT}/hack/integration-tests/${SUITE}" -name "*.sh" -type f | sort)
     for assert_script in $ASSERTION_SCRIPTS; do
       echo "======================================================================================================"
       echo "Running assertion script $(basename "$assert_script")"