From 54454d9a02f0005eaed4e0777fd807793a491103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20S=C4=99k?= <tomasz.sek.88@gmail.com>
Date: Sun, 30 Jun 2019 23:14:52 +0200
Subject: [PATCH] #28 Mount secrets for groovy and CasC customization

- fix e2e tests
---
 test/e2e/configuration_test.go | 16 ++++++++--------
 test/e2e/jenkins.go            |  5 +++++
 test/e2e/restart_test.go       |  7 +++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go
index 089df965..e80384eb 100644
--- a/test/e2e/configuration_test.go
+++ b/test/e2e/configuration_test.go
@@ -46,7 +46,7 @@ func TestConfiguration(t *testing.T) {
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: resources.GetUserConfigurationConfigMapName(jenkinsCRName),
+						Name: userConfigurationConfigMapName,
 					},
 				},
 			},
@@ -55,15 +55,15 @@ func TestConfiguration(t *testing.T) {
 			Name: "test-secret",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName: resources.GetUserConfigurationSecretName(jenkinsCRName),
+					SecretName: userConfigurationSecretName,
 				},
 			},
 		},
 	}
 
 	// base
-	createUserConfigurationSecret(t, jenkinsCRName, namespace, systemMessageEnvName, systemMessage)
-	createUserConfigurationConfigMap(t, jenkinsCRName, namespace, numberOfExecutors, fmt.Sprintf("${%s}", systemMessageEnvName))
+	createUserConfigurationSecret(t, namespace, systemMessageEnvName, systemMessage)
+	createUserConfigurationConfigMap(t, namespace, numberOfExecutors, fmt.Sprintf("${%s}", systemMessageEnvName))
 	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &[]v1alpha2.SeedJob{mySeedJob.SeedJob}, volumes)
 	createDefaultLimitsForContainersInNamespace(t, namespace)
 	createKubernetesCredentialsProviderSecret(t, namespace, mySeedJob)
@@ -79,10 +79,10 @@ func TestConfiguration(t *testing.T) {
 	verifyJenkinsSeedJobs(t, client, []seedJobConfig{mySeedJob})
 }
 
-func createUserConfigurationSecret(t *testing.T, jenkinsCRName string, namespace string, systemMessageEnvName, systemMessage string) {
+func createUserConfigurationSecret(t *testing.T, namespace string, systemMessageEnvName, systemMessage string) {
 	userConfiguration := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      resources.GetUserConfigurationSecretName(jenkinsCRName),
+			Name:      userConfigurationSecretName,
 			Namespace: namespace,
 		},
 		StringData: map[string]string{
@@ -96,10 +96,10 @@ func createUserConfigurationSecret(t *testing.T, jenkinsCRName string, namespace
 	}
 }
 
-func createUserConfigurationConfigMap(t *testing.T, jenkinsCRName string, namespace string, numberOfExecutors int, systemMessage string) {
+func createUserConfigurationConfigMap(t *testing.T, namespace string, numberOfExecutors int, systemMessage string) {
 	userConfiguration := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      resources.GetUserConfigurationConfigMapName(jenkinsCRName),
+			Name:      userConfigurationConfigMapName,
 			Namespace: namespace,
 		},
 		Data: map[string]string{
diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go
index 7a1fd010..580b1cb9 100644
--- a/test/e2e/jenkins.go
+++ b/test/e2e/jenkins.go
@@ -17,6 +17,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
+const (
+	userConfigurationConfigMapName = "user-config"
+	userConfigurationSecretName    = "user-secret"
+)
+
 func getJenkins(t *testing.T, namespace, name string) *v1alpha2.Jenkins {
 	jenkins := &v1alpha2.Jenkins{}
 	namespaceName := types.NamespacedName{Namespace: namespace, Name: name}
diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go
index ca4f07a9..0dce822d 100644
--- a/test/e2e/restart_test.go
+++ b/test/e2e/restart_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2"
 	jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client"
-	"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources"
 
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
 	"github.com/stretchr/testify/require"
@@ -36,7 +35,7 @@ func TestSafeRestart(t *testing.T) {
 	defer ctx.Cleanup()
 
 	jenkinsCRName := "e2e"
-	configureAuthorizationToUnSecure(t, jenkinsCRName, namespace)
+	configureAuthorizationToUnSecure(t, namespace)
 	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, []corev1.Volume{})
 	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
 	waitForJenkinsUserConfigurationToComplete(t, jenkins)
@@ -50,10 +49,10 @@ func TestSafeRestart(t *testing.T) {
 	checkIfAuthorizationStrategyUnsecuredIsSet(t, jenkinsClient)
 }
 
-func configureAuthorizationToUnSecure(t *testing.T, jenkinsCRName, namespace string) {
+func configureAuthorizationToUnSecure(t *testing.T, namespace string) {
 	limitRange := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      resources.GetUserConfigurationConfigMapName(jenkinsCRName),
+			Name:      userConfigurationConfigMapName,
 			Namespace: namespace,
 		},
 		Data: map[string]string{