correct HPO e2e paths

rancher · Oct 11, 2024 · 109b5f6 · 109b5f6
1 parent e473057
commit 109b5f6
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/...e/scripts/hpo/create-project-namespace.sh → ...e/scripts/hpo-create-project-namespace.sh b/...e/scripts/hpo/create-project-namespace.sh → ...e/scripts/hpo-create-project-namespace.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 USE_RANCHER=${USE_RANCHER:-"false"}
 if [ "$USE_RANCHER" = "true" ]; then

diff --git a/...2e/scripts/hpo/create-projecthelmchart.sh → ...2e/scripts/hpo-create-projecthelmchart.sh b/...2e/scripts/hpo/create-projecthelmchart.sh → ...2e/scripts/hpo-create-projecthelmchart.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 kubectl apply -f ./examples/helm-project-operator/ci/project-helm-chart.yaml
 sleep ${DEFAULT_SLEEP_TIMEOUT_SECONDS};

diff --git a/...2e/scripts/hpo/delete-projecthelmchart.sh → ...2e/scripts/hpo-delete-projecthelmchart.sh b/...2e/scripts/hpo/delete-projecthelmchart.sh → ...2e/scripts/hpo-delete-projecthelmchart.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 kubectl delete -f ./examples/helm-project-operator/ci/project-helm-chart.yaml
 if kubectl get -n cattle-helm-system job/helm-delete-project-operator-example-chart-dummy --ignore-not-found; then

diff --git a/...ipts/hpo/install-helm-project-operator.sh → ...ipts/hpo-install-helm-project-operator.sh b/...ipts/hpo/install-helm-project-operator.sh → ...ipts/hpo-install-helm-project-operator.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
-latest_chart=./charts/helm-project-operator
+latest_chart=./packages/helm-project-operator/charts
 
 case "${KUBERNETES_DISTRIBUTION_TYPE}" in
 "k3s")

diff --git a/...ts/hpo/uninstall-helm-project-operator.sh → ...ts/hpo-uninstall-helm-project-operator.sh b/...ts/hpo/uninstall-helm-project-operator.sh → ...ts/hpo-uninstall-helm-project-operator.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 helm uninstall --wait -n cattle-helm-system helm-project-operator
 

diff --git a/...pts/hpo/validate-helm-project-operator.sh → ...pts/hpo-validate-helm-project-operator.sh b/...pts/hpo/validate-helm-project-operator.sh → ...pts/hpo-validate-helm-project-operator.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/../entry
+source $(dirname $0)/entry
 
-cd $(dirname $0)/../../../../..
+cd $(dirname $0)/../../../..
 
 if ! kubectl -n cattle-helm-system rollout status deployment helm-project-operator --timeout="${KUBECTL_WAIT_TIMEOUT}"; then 
     echo "ERROR: Helm Project Operator did not roll out"

diff --git a/.github/workflows/hpo-e2e-ci.yaml b/.github/workflows/hpo-e2e-ci.yaml
@@ -85,22 +85,22 @@ jobs:
         with:
           limit-access-to-actor: true
       - name: Install Helm Project Operator
-        run: ./.github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh;
 
       - name: Check if Helm Project Operator is up
-        run: ./.github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh;
 
       - name: Check if Project Registration Namespace is auto-created on namespace detection
-        run: ./.github/workflows/e2e/scripts/hpo/create-project-namespace.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-create-project-namespace.sh;
 
       - name: Deploy Example Chart via ProjectHelmChart CR
-        run: ./.github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh;
 
       - name: Delete Example Chart
-        run: ./.github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh;
 
       - name: Uninstall Helm Project Operator
-        run: ./.github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh;
+        run: ./.github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh;
 
       - name: Delete k3d cluster
         if: always()

diff --git a/.github/workflows/prom-fed-e2e-ci.yaml b/.github/workflows/prom-fed-e2e-ci.yaml
@@ -102,7 +102,7 @@ jobs:
       -
         name: Perform pre-e2e image build
         run: |
-          EMBEDDED_CHART_VERSION=0.3.4 REPO=${REPO} TAG=${TAG} make build;
+          EMBEDED_CHART_VERSION=0.3.4 REPO=${REPO} TAG=${TAG} make build;
           REPO=${REPO} TAG=${TAG} make package;
       -
         name : Install k3d