diff --git a/test/e2e/setup.go b/test/e2e/setup.go index ded80fd8326..c0f16b25811 100644 --- a/test/e2e/setup.go +++ b/test/e2e/setup.go @@ -396,17 +396,17 @@ func setup(ctx context.Context) error { osClusterVersion = os.Getenv("OS_CLUSTER_VERSION") - if os.Getenv("CI") != "" { // always create cluster in CI - cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") - if err != nil { - return err - } - - err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) - if err != nil { - return err - } - } + // if os.Getenv("CI") != "" { // always create cluster in CI + // cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") + // if err != nil { + // return err + // } + + // err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) + // if err != nil { + // return err + // } + // } clusterResourceID = resourceIDFromEnv() @@ -436,7 +436,7 @@ func done(ctx context.Context) error { } var _ = BeforeSuite(func() { - log.Info("BeforeSuite") + log.Info("BeforeSuite chiac e2e test") SetDefaultEventuallyTimeout(DefaultEventuallyTimeout) SetDefaultEventuallyPollingInterval(10 * time.Second) @@ -450,12 +450,12 @@ var _ = BeforeSuite(func() { }) var _ = AfterSuite(func() { - log.Info("AfterSuite") - - if err := done(context.Background()); err != nil { - if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok { - spew.Dump(oDataError.GetErrorEscaped()) - } - panic(err) - } + log.Info("AfterSuite chiac e2e test") + + // if err := done(context.Background()); err != nil { + // if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok { + // spew.Dump(oDataError.GetErrorEscaped()) + // } + // panic(err) + // } }) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index c3051864fa3..d7db429e9c2 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -49,8 +49,11 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { } tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) + // tokenURL.Host = "20.168.212.108" tokenURL.Path = "/oauth/authorize" + fmt.Println(tokenURL.Host) + q := tokenURL.Query() q.Set("response_type", "token") q.Set("client_id", "openshift-challenging-client") @@ -65,6 +68,8 @@ func getAuthorizedToken(ctx context.Context, tokenURL *url.URL, username, passwo return "", err } + fmt.Println(tokenURL.String()) + req.SetBasicAuth(username, password) req.Header.Add("X-CSRF-Token", "1")