Merge branch 'master' into test-pairing

Author: mfrancisc

test/e2e/parallel/user_workloads_test.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
-	testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
 	. "github.com/codeready-toolchain/toolchain-e2e/testsupport"
 	"github.com/codeready-toolchain/toolchain-e2e/testsupport/wait"
 	openshiftappsv1 "github.com/openshift/api/apps/v1"
@@ -26,8 +25,6 @@ func TestIdlerAndPriorityClass(t *testing.T) {
 	await := WaitForDeployments(t)
 	hostAwait := await.Host()
 	memberAwait := await.Member1()
-	// Provision a user to idle with a short idling timeout
-	hostAwait.UpdateToolchainConfig(t, testconfig.AutomaticApproval().Enabled(false))
 	NewSignupRequest(await).
 		Username("test-idler").
 		Email("test-idler@redhat.com").

test/e2e/parallel/vm_webhook_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"testing"
 
-	testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -27,17 +26,13 @@ func TestCreateVirtualMachine(t *testing.T) {
 
 	// make sure everything is ready before running the actual tests
 	awaitilities := WaitForDeployments(t)
-	hostAwait := awaitilities.Host()
 	memberAwait := awaitilities.Member1()
 
 	client, err := dynamic.NewForConfig(memberAwait.RestConfig)
 	if err != nil {
 		panic(err)
 	}
 
-	// Provision a user to create the vm
-	hostAwait.UpdateToolchainConfig(t, testconfig.AutomaticApproval().Enabled(false))
-
 	userCounter := 1
 
 	for tcname, tc := range map[string]struct {

testsupport/signup_request.go

@@ -248,8 +248,9 @@ func (r *SignupRequest) Execute(t *testing.T) *SignupResult {
 	userSignup, err := hostAwait.WaitForUserSignup(t, wait.EncodeUserIdentifier(userIdentity.Username))
 	require.NoError(t, err, "failed to find UserSignup %s", userIdentity.Username)
 
-	if r.targetCluster != nil && hostAwait.GetToolchainConfig(t).Spec.Host.AutomaticApproval.Enabled != nil {
-		require.False(t, *hostAwait.GetToolchainConfig(t).Spec.Host.AutomaticApproval.Enabled,
+	autoApproval := hostAwait.GetToolchainConfig(t).Spec.Host.AutomaticApproval
+	if r.targetCluster != nil && autoApproval.Enabled != nil {
+		require.False(t, *autoApproval.Enabled,
 			"cannot specify a target cluster for new signup requests while automatic approval is enabled")
 	}