Skip to content

Commit ddc6d11

Browse files
committed
correct HPO e2e paths
1 parent 792a149 commit ddc6d11

8 files changed

+22
-22
lines changed

.github/workflows/e2e/scripts/hpo/create-project-namespace.sh renamed to .github/workflows/e2e/scripts/hpo-create-project-namespace.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/../entry
4+
source $(dirname $0)/entry
55

6-
cd $(dirname $0)/../../../../..
6+
cd $(dirname $0)/../../../..
77

88
USE_RANCHER=${USE_RANCHER:-"false"}
99
if [ "$USE_RANCHER" = "true" ]; then

.github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh renamed to .github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/../entry
4+
source $(dirname $0)/entry
55

6-
cd $(dirname $0)/../../../../..
6+
cd $(dirname $0)/../../../..
77

88
kubectl apply -f ./examples/helm-project-operator/ci/project-helm-chart.yaml
99
sleep ${DEFAULT_SLEEP_TIMEOUT_SECONDS};

.github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh renamed to .github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/../entry
4+
source $(dirname $0)/entry
55

6-
cd $(dirname $0)/../../../../..
6+
cd $(dirname $0)/../../../..
77

88
kubectl delete -f ./examples/helm-project-operator/ci/project-helm-chart.yaml
99
if kubectl get -n cattle-helm-system job/helm-delete-project-operator-example-chart-dummy --ignore-not-found; then

.github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh renamed to .github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/../entry
4+
source $(dirname $0)/entry
55

6-
cd $(dirname $0)/../../../../..
6+
cd $(dirname $0)/../../../..
77

8-
latest_chart=./charts/helm-project-operator
8+
latest_chart=./packages/helm-project-operator/charts
99

1010
case "${KUBERNETES_DISTRIBUTION_TYPE}" in
1111
"k3s")

.github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh renamed to .github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/../entry
4+
source $(dirname $0)/entry
55

6-
cd $(dirname $0)/../../../../..
6+
cd $(dirname $0)/../../../..
77

88
helm uninstall --wait -n cattle-helm-system helm-project-operator
99

.github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh renamed to .github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
source $(dirname $0)/../entry
4+
source $(dirname $0)/entry
55

6-
cd $(dirname $0)/../../../../..
6+
cd $(dirname $0)/../../../..
77

88
if ! kubectl -n cattle-helm-system rollout status deployment helm-project-operator --timeout="${KUBECTL_WAIT_TIMEOUT}"; then
99
echo "ERROR: Helm Project Operator did not roll out"

.github/workflows/hpo-e2e-ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@ jobs:
8585
with:
8686
limit-access-to-actor: true
8787
- name: Install Helm Project Operator
88-
run: ./.github/workflows/e2e/scripts/hpo/install-helm-project-operator.sh;
88+
run: ./.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh;
8989

9090
- name: Check if Helm Project Operator is up
91-
run: ./.github/workflows/e2e/scripts/hpo/validate-helm-project-operator.sh;
91+
run: ./.github/workflows/e2e/scripts/hpo-validate-helm-project-operator.sh;
9292

9393
- name: Check if Project Registration Namespace is auto-created on namespace detection
94-
run: ./.github/workflows/e2e/scripts/hpo/create-project-namespace.sh;
94+
run: ./.github/workflows/e2e/scripts/hpo-create-project-namespace.sh;
9595

9696
- name: Deploy Example Chart via ProjectHelmChart CR
97-
run: ./.github/workflows/e2e/scripts/hpo/create-projecthelmchart.sh;
97+
run: ./.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh;
9898

9999
- name: Delete Example Chart
100-
run: ./.github/workflows/e2e/scripts/hpo/delete-projecthelmchart.sh;
100+
run: ./.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh;
101101

102102
- name: Uninstall Helm Project Operator
103-
run: ./.github/workflows/e2e/scripts/hpo/uninstall-helm-project-operator.sh;
103+
run: ./.github/workflows/e2e/scripts/hpo-uninstall-helm-project-operator.sh;
104104

105105
- name: Delete k3d cluster
106106
if: always()

.github/workflows/prom-fed-e2e-ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ jobs:
139139
run: ./.github/workflows/e2e/scripts/validate-federator.sh;
140140
-
141141
name: Check if Project Registration Namespace is auto-created on namespace detection
142-
run: ./.github/workflows/e2e/scripts/create-project-namespace.sh;
142+
run: ./.github/workflows/e2e/scripts/hpo-create-project-namespace.sh;
143143
-
144144
name: Create Project Monitoring Stack via ProjectHelmChart CR
145-
run: DEFAULT_SLEEP_TIMEOUT_SECONDS=20 ./.github/workflows/e2e/scripts/create-projecthelmchart.sh;
145+
run: DEFAULT_SLEEP_TIMEOUT_SECONDS=20 ./.github/workflows/e2e/scripts/hpo-create-projecthelmchart.sh;
146146
-
147147
name: Check if the Project Prometheus Stack is up
148148
run: ./.github/workflows/e2e/scripts/validate-project-monitoring.sh;
@@ -172,7 +172,7 @@ jobs:
172172
run: ./.github/workflows/e2e/scripts/validate-project-alertmanager.sh;
173173
-
174174
name: Delete Project Prometheus Stack
175-
run: ./.github/workflows/e2e/scripts/delete-projecthelmchart.sh;
175+
run: ./.github/workflows/e2e/scripts/hpo-delete-projecthelmchart.sh;
176176
-
177177
name: Uninstall Prometheus Federator
178178
run: ./.github/workflows/e2e/scripts/uninstall-federator.sh;

0 commit comments

Comments
 (0)