Skip to content

Commit

Permalink
Remove upgrade-stable integration test, refactor helm-upgrade (#1…
Browse files Browse the repository at this point in the history
…2519)

This removes the `upgrade-stable` integration test and refactors the
`helm-upgrade` one to upgrade from the last published edge helm charts
instead of the last stable.
  • Loading branch information
alpeb committed Apr 29, 2024
1 parent ece6600 commit e6a7071
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 621 deletions.
1 change: 0 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ jobs:
- helm-upgrade
- uninstall
- upgrade-edge
- upgrade-stable
runs-on: ubuntu-22.04
timeout-minutes: 15
steps:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ jobs:
- helm-upgrade
- uninstall
- upgrade-edge
- upgrade-stable
timeout-minutes: 60
runs-on: ubuntu-22.04
steps:
Expand Down
20 changes: 7 additions & 13 deletions bin/_test-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ testdir="$bindir"/../test/integration

##### Test setup helpers #####

export default_test_names=(deep viz external helm-upgrade uninstall upgrade-edge upgrade-stable default-policy-deny rsa-ca)
export default_test_names=(deep viz external helm-upgrade uninstall upgrade-edge default-policy-deny rsa-ca)
export external_resource_test_names=(external-resources)
export all_test_names=(cluster-domain cni-calico-deep multicluster "${default_test_names[*]}" "${external_resource_test_names[*]}")
images_load_default=(proxy controller policy-controller web metrics-api tap)
Expand Down Expand Up @@ -387,12 +387,6 @@ run_upgrade-edge_test() {
run_test "$testdir/upgrade-edge/..."
}

# Run the upgrade-stable test by upgrading the most-recent stable release to the
# HEAD of this branch.
run_upgrade-stable_test() {
run_test "$testdir/upgrade-stable/..."
}

run_viz_test() {
run_test "$testdir/viz/..."
}
Expand All @@ -404,7 +398,7 @@ setup_helm() {
export helm_release_name='helm-test'
export helm_multicluster_release_name='multicluster-test'
"$bindir"/helm-build
"$helm_path" --kube-context="$context" repo add linkerd https://helm.linkerd.io/stable
"$helm_path" --kube-context="$context" repo add linkerd https://helm.linkerd.io/edge
exit_on_err 'error setting up Helm'
}

Expand All @@ -423,18 +417,18 @@ helm_cleanup() {
}

run_helm-upgrade_test() {
local stable_version
stable_version=$(latest_release_channel 'stable')
local edge_version
edge_version=$(latest_release_channel 'edge')

if [ -z "$stable_version" ]; then
echo 'error getting stable_version'
if [ -z "$edge_version" ]; then
echo 'error getting edge_version'
exit 1
fi

setup_helm
helm_viz_chart="$( cd "$bindir"/.. && pwd )"/viz/charts/linkerd-viz
run_test "$testdir/install/install_test.go" --helm-path="$helm_path" --helm-charts="$helm_charts" \
--viz-helm-chart="$helm_viz_chart" --viz-helm-stable-chart="linkerd/linkerd-viz" --helm-release="$helm_release_name" --upgrade-helm-from-version="$stable_version"
--viz-helm-chart="$helm_viz_chart" --viz-helm-stable-chart="linkerd/linkerd-viz" --helm-release="$helm_release_name" --upgrade-helm-from-version="$edge_version"
helm_cleanup
}

Expand Down
157 changes: 0 additions & 157 deletions test/integration/upgrade-stable/testdata/emoji.yaml

This file was deleted.

Loading

0 comments on commit e6a7071

Please sign in to comment.