Skip to content

Commit

Permalink
ci(test.mk): Use same/latest k8s version for upgrade tests
Browse files Browse the repository at this point in the history
  • Loading branch information
gracedo committed Jul 28, 2023
1 parent baaf234 commit fd3b42f
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions make/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ E2E_TIMEOUT ?= 120m
# by default with DKP.
# See https://github.com/mesosphere/kind-docker-image-automation/ for the build repo.
E2E_KINDEST_IMAGE ?= "mesosphere/kind-node-ci:v1.26.3"

# Kommander <=v2.3 does not install on Kubernetes >=v1.24 due to the introduction of
# `LegacyServiceAccountTokenNoAutoGeneration` feature (enabled by default). This breaks self-attachment
# and therefore the whole install process so we need to run the upgrade tests against an older version
# of Kubernetes. This can be removed once the `UPGRADE_FROM_VERSION` below is Kommander >=v2.4.
E2E_KINDEST_IMAGE_FOR_UPGRADE_TEST ?= "mesosphere/kind-node-ci:v1.23.9"
UPGRADE_FROM_VERSION ?= "v2.6.0-dev"

# (aweris): This should be a temporary workaround for v2.3.0 development. If you're still see clone test in v2.4.0
Expand Down Expand Up @@ -51,7 +45,7 @@ test.e2e.upgrade.singlecluster: kommander-e2e ; $(info $(M) running end-to-end k
cd $(KOMMANDER_E2E_DIR) && \
E2E_TEST_PATH="feature/upgrade/suites/kind/singlecluster" \
E2E_TIMEOUT=$(E2E_TIMEOUT) \
E2E_KINDEST_IMAGE=$(E2E_KINDEST_IMAGE_FOR_UPGRADE_TEST) \
E2E_KINDEST_IMAGE=$(E2E_KINDEST_IMAGE) \
E2E_KOMMANDER_APPLICATIONS_REPOSITORY="github.com/mesosphere/kommander-applications.git?ref=$(UPGRADE_FROM_VERSION)" \
E2E_KOMMANDER_APPLICATIONS_REPOSITORY_TO_UPGRADE="github.com/mesosphere/kommander-applications.git?ref=$(GIT_COMMIT)" \
VERBOSE=$(VERBOSE) \
Expand Down

0 comments on commit fd3b42f

Please sign in to comment.