diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 1baa0878..ecc42309 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -6,8 +6,9 @@ const ( jobDslPlugin = "job-dsl:1.89" kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" - workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" - workflowJobPlugin = "workflow-job:1436.vfa_244484591f" + // Depends on workflow-job which should be automatically downloaded + // Hardcoding the workflow-job version leads to frequent breakage + workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" ) // basePluginsList contains plugins to install by operator. @@ -18,7 +19,6 @@ var basePluginsList = []Plugin{ Must(New(kubernetesPlugin)), Must(New(kubernetesCredentialsProviderPlugin)), Must(New(workflowAggregatorPlugin)), - Must(New(workflowJobPlugin)), } // BasePlugins returns list of plugins to install by operator. diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 3d40275e..14fb8b32 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -24,15 +24,16 @@ import ( const e2e = "e2e" // Plugin versions should be the same as in -// github.com/jenkinsci/kubernetes-operator/pkg/plugins +// github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go const ( configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d" gitPlugin = "git:5.7.0" jobDslPlugin = "job-dsl:1.89" kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" - workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" - workflowJobPlugin = "workflow-job:1436.vfa_244484591f" + // Depends on workflow-job which should be automatically downloaded + // Hardcoding the workflow-job version leads to frequent breakage + workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" ) var expectedBasePluginsList = []plugins.Plugin{ @@ -42,7 +43,6 @@ var expectedBasePluginsList = []plugins.Plugin{ plugins.Must(plugins.New(kubernetesPlugin)), plugins.Must(plugins.New(kubernetesCredentialsProviderPlugin)), plugins.Must(plugins.New(workflowAggregatorPlugin)), - plugins.Must(plugins.New(workflowJobPlugin)), } func createUserConfigurationSecret(namespace string, stringData map[string]string) {