Improve plugins management

test/e2e/configuration_test.go

@@ -228,25 +228,16 @@ func verifyPlugins(t *testing.T, jenkinsClient jenkinsclient.Jenkins, jenkins *v
 		t.Fatal(err)
 	}
 
-	requiredPlugins := []map[string][]string{plugins.BasePlugins(), jenkins.Spec.Master.Plugins}
-	for _, p := range requiredPlugins {
-		for rootPluginName, dependentPlugins := range p {
-			rootPlugin, err := plugins.New(rootPluginName)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if found, ok := isPluginValid(installedPlugins, *rootPlugin); !ok {
-				t.Fatalf("Invalid plugin '%s', actual '%+v'", rootPlugin, found)
-			}
-			for _, pluginName := range dependentPlugins {
-				plugin, err := plugins.New(pluginName)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if found, ok := isPluginValid(installedPlugins, *plugin); !ok {
-					t.Fatalf("Invalid plugin '%s', actual '%+v'", rootPlugin, found)
-				}
-			}
+	for _, basePlugin := range plugins.BasePlugins() {
+		if found, ok := isPluginValid(installedPlugins, basePlugin); !ok {
+			t.Fatalf("Invalid plugin '%s', actual '%+v'", basePlugin, found)
+		}
+	}
+
+	for _, userPlugin := range jenkins.Spec.Master.Plugins {
+		plugin := plugins.Plugin{Name: userPlugin.Name, Version: userPlugin.Version}
+		if found, ok := isPluginValid(installedPlugins, plugin); !ok {
+			t.Fatalf("Invalid plugin '%s', actual '%+v'", plugin, found)
 		}
 	}
 

test/e2e/jenkins.go

@@ -113,9 +113,9 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S
 						Image: "envoyproxy/envoy-alpine",
 					},
 				},
-				Plugins: map[string][]string{
-					"audit-trail:2.4":           {},
-					"simple-theme-plugin:0.5.1": {},
+				Plugins: []v1alpha2.Plugin{
+					{Name: "audit-trail:", Version: "2.4"},
+					{Name: "simple-theme-plugin", Version: "0.5.1"},
 				},
 				NodeSelector: map[string]string{"kubernetes.io/hostname": "minikube"},
 				Volumes:      volumes,