debug

metal3-io · Mar 31, 2023 · 3bb79c4 · 3bb79c4
1 parent 9dda469
commit 3bb79c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -59,7 +59,7 @@ source "${M3_DEV_ENV_PATH}/lib/ironic_basic_auth.sh"
 source "${M3_DEV_ENV_PATH}/lib/ironic_tls_setup.sh"
 
 # Parameterize e2e_config
-export CAPI_FROM_RELEASE="${CAPI_FROM_RELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v0.4.")}"
+export CAPI_FROM_RELEASE="${CAPI_FROM_RELEASE:-$(get_latest_release "${CAPIRELEASEPATH}" "v1.1.")}"
 export CAPI_TO_RELEASE="${CAPIRELEASE}"
 case ${CAPI_FROM_RELEASE} in
 v0.4*)
@@ -69,7 +69,7 @@ v1.*)
     export CONTRACT="v1beta1"
     ;;
 esac
-export CAPM3_FROM_RELEASE="${CAPM3_FROM_RELEASE:-$(get_latest_release "${CAPM3RELEASEPATH}" "v0.5.")}"
+export CAPM3_FROM_RELEASE="${CAPM3_FROM_RELEASE:-$(get_latest_release "${CAPM3RELEASEPATH}" "v1.1.")}"
 
 # image for live iso testing
 export LIVE_ISO_IMAGE="https://artifactory.nordix.org/artifactory/metal3/images/iso/minimal_linux_live-v2.iso"

diff --git a/test/e2e/upgrade_management_cluster_test.go b/test/e2e/upgrade_management_cluster_test.go
@@ -34,10 +34,10 @@ var _ = Describe("When testing cluster upgrade v1.1 > current [upgrd11]", func()
 			BootstrapClusterProxy:           bootstrapClusterProxy,
 			ArtifactFolder:                  artifactFolder,
 			SkipCleanup:                     skipCleanup,
-			InitWithCoreProvider:            fmt.Sprintf("capi-system/cluster-api:%s", os.Getenv("CAPI_FROM_RELEASE")),
-			InitWithBootstrapProviders:      []string{fmt.Sprintf("capi-kubeadm-bootstrap-system/kubeadm:%s", os.Getenv("CAPI_FROM_RELEASE"))},
-			InitWithControlPlaneProviders:   []string{fmt.Sprintf("capi-kubeadm-control-plane-system/kubeadm:%s", os.Getenv("CAPI_FROM_RELEASE"))},
-			InitWithInfrastructureProviders: []string{fmt.Sprintf("capm3-system/metal3:%s", os.Getenv("CAPM3_FROM_RELEASE"))},
+			InitWithCoreProvider:            fmt.Sprintf("cluster-api:%s", os.Getenv("CAPI_FROM_RELEASE")),
+			InitWithBootstrapProviders:      []string{fmt.Sprintf("kubeadm:%s", os.Getenv("CAPI_FROM_RELEASE"))},
+			InitWithControlPlaneProviders:   []string{fmt.Sprintf("kubeadm:%s", os.Getenv("CAPI_FROM_RELEASE"))},
+			InitWithInfrastructureProviders: []string{fmt.Sprintf("metal3:%s", os.Getenv("CAPM3_FROM_RELEASE"))},
 			InitWithBinary:                  e2eConfig.GetVariable("INIT_WITH_BINARY"),
 			PreInit:                         preInitFunc,
 			PreWaitForCluster:               preWaitForCluster,