From dc86778d67c53f48c456c4dc3269a4e441991635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Wed, 4 Sep 2019 11:27:36 +0200 Subject: [PATCH] #28 Fix e2e test --- test/e2e/restart_test.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 47d9445a..5298bf61 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -28,7 +28,6 @@ func TestJenkinsMasterPodRestart(t *testing.T) { waitForJenkinsBaseConfigurationToComplete(t, jenkins) } -// FIXME java.lang.Exception: AuthorizationStrategy.Unsecured is not set func TestSafeRestart(t *testing.T) { t.Parallel() namespace, ctx := setupTest(t) @@ -36,8 +35,17 @@ func TestSafeRestart(t *testing.T) { defer ctx.Cleanup() jenkinsCRName := "e2e" - configureAuthorizationToUnSecure(t, namespace) - jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}) + configureAuthorizationToUnSecure(t, namespace, userConfigurationConfigMapName) + groovyScriptsConfig := v1alpha2.GroovyScripts{ + Customization: v1alpha2.Customization{ + Configurations: []v1alpha2.ConfigMapRef{ + { + Name: userConfigurationConfigMapName, + }, + }, + }, + } + jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, groovyScriptsConfig, v1alpha2.ConfigurationAsCode{}) waitForJenkinsBaseConfigurationToComplete(t, jenkins) waitForJenkinsUserConfigurationToComplete(t, jenkins) jenkinsClient := verifyJenkinsAPIConnection(t, jenkins) @@ -50,10 +58,10 @@ func TestSafeRestart(t *testing.T) { checkIfAuthorizationStrategyUnsecuredIsSet(t, jenkinsClient) } -func configureAuthorizationToUnSecure(t *testing.T, namespace string) { +func configureAuthorizationToUnSecure(t *testing.T, namespace, configMapName string) { limitRange := &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: userConfigurationConfigMapName, + Name: configMapName, Namespace: namespace, }, Data: map[string]string{