From d8a0d7ff3273aa2679ed20067267c16b9517b279 Mon Sep 17 00:00:00 2001 From: xmbhasin Date: Sat, 22 Mar 2025 17:41:34 -0400 Subject: [PATCH] fix(base_plugins): jenkins crashing during plugin dep resolution * ensures plugin versions are compatible as of 2025-03-22 --- pkg/plugins/base_plugins.go | 9 ++++----- test/e2e/configuration_test.go | 25 ++++++++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 9333afdb..5b108e01 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,13 +1,13 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1850.va_a_8c31d3158b_" - gitPlugin = "git:5.6.0" + 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 + workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" ) // basePluginsList contains plugins to install by operator. @@ -17,7 +17,6 @@ var basePluginsList = []Plugin{ Must(New(jobDslPlugin)), Must(New(kubernetesPlugin)), Must(New(kubernetesCredentialsProviderPlugin)), - Must(New(workflowJobPlugin)), Must(New(workflowAggregatorPlugin)), } diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 3a2cd52e..9a6fd852 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -23,14 +23,25 @@ import ( const e2e = "e2e" +// Plugin versions should be the same as in +// github.com/jenkinsci/kubernetes-operator/pkg/plugins +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" + // Depends on workflow-job which should be automatically downloaded + workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" +) + var expectedBasePluginsList = []plugins.Plugin{ - plugins.Must(plugins.New("configuration-as-code:1850.va_a_8c31d3158b_")), - plugins.Must(plugins.New("git:5.6.0")), - plugins.Must(plugins.New("kubernetes:4295.v7fa_01b_309c95")), - plugins.Must(plugins.New("kubernetes-credentials-provider:1.262.v2670ef7ea_0c5")), - plugins.Must(plugins.New("job-dsl:1.89")), - plugins.Must(plugins.New("workflow-aggregator:600.vb_57cdd26fdd7")), - plugins.Must(plugins.New("workflow-job:1436.vfa_244484591f")), + plugins.Must(plugins.New(configurationAsCodePlugin)), + plugins.Must(plugins.New(gitPlugin)), + plugins.Must(plugins.New(jobDslPlugin)), + plugins.Must(plugins.New(kubernetesPlugin)), + plugins.Must(plugins.New(kubernetesCredentialsProviderPlugin)), + plugins.Must(plugins.New(workflowAggregatorPlugin)), } func createUserConfigurationSecret(namespace string, stringData map[string]string) {