Skip to content

Commit 383bf1c

Browse files
committed
fix script path
1 parent 0709009 commit 383bf1c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source $(dirname $0)/entry
55
source $(dirname $0)/cluster-args.sh
66

77
cd $(dirname $0)/../../../..
8-
source "$(dirname "$0")/scripts/util-team-charts"
8+
source "$(pwd)/scripts/util-team-charts"
99

1010
NEWEST_CHART_VERSION=$(newest-chart-version "helm-project-operator")
1111
fetch-team-chart "helm-project-operator" "$NEWEST_CHART_VERSION"

.github/workflows/e2e/scripts/install-federator.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ source $(dirname $0)/entry
66
source $(dirname $0)/cluster-args.sh
77

88
cd $(dirname $0)/../../../..
9+
source "$(pwd)/scripts/util-team-charts"
910

10-
latest_chart=$(find ./charts/prometheus-federator -type d -maxdepth 1 -mindepth 1 | tr - \~ | sort -rV | tr \~ - | head -n1)
11+
NEWEST_CHART_VERSION=$(newest-chart-version "prometheus-federator")
12+
fetch-team-chart "prometheus-federator" "$NEWEST_CHART_VERSION"
13+
LATEST_CHART_PATH="./build/charts/prometheus-federator-${NEWEST_CHART_VERSION}.tgz"
1114

12-
helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator --set helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator --set helmProjectOperator.image.tag=${TAG:-dev} ${cluster_args} ${RANCHER_HELM_ARGS} ${latest_chart}
15+
helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator \
16+
--set "helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator" \
17+
--set "helmProjectOperator.image.tag=${TAG:-dev}" \
18+
"${cluster_args}" \
19+
"${RANCHER_HELM_ARGS}" \
20+
"${LATEST_CHART_PATH}"
1321

1422
echo "PASS: Prometheus Federator has been installed"

0 commit comments

Comments
 (0)