From 7a4233654a0ce1dbaa09cbe7c7d3f11e33854d77 Mon Sep 17 00:00:00 2001 From: Luigi Operoso <40476330+brokenpip3@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:27:01 +0000 Subject: [PATCH] fix e2e test --- api/v1alpha2/zz_generated.deepcopy.go | 6 +++++- test/e2e/jenkins_test.go | 8 ++++---- test/e2e/test_utility.go | 8 ++++---- test/helm/helm_test.go | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go index 35547563..6caa129b 100644 --- a/api/v1alpha2/zz_generated.deepcopy.go +++ b/api/v1alpha2/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -357,6 +356,11 @@ func (in *JenkinsMaster) DeepCopyInto(out *JenkinsMaster) { *out = make([]Plugin, len(*in)) copy(*out, *in) } + if in.LatestPlugins != nil { + in, out := &in.LatestPlugins, &out.LatestPlugins + *out = new(bool) + **out = **in + } if in.HostAliases != nil { in, out := &in.HostAliases, &out.HostAliases *out = make([]corev1.HostAlias, len(*in)) diff --git a/test/e2e/jenkins_test.go b/test/e2e/jenkins_test.go index 4c3a45d9..0417964c 100644 --- a/test/e2e/jenkins_test.go +++ b/test/e2e/jenkins_test.go @@ -125,10 +125,10 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed }, }, Plugins: []v1alpha2.Plugin{ - {Name: "audit-trail", Version: "3.11"}, - {Name: "simple-theme-plugin", Version: "136.v23a_15f86c53d"}, - {Name: "github", Version: "1.36.0"}, - {Name: "devoptics", Version: "1.1973", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1973/devoptics.hpi"}, + {Name: "audit-trail", Version: "361.v82cde86c784e"}, + {Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, + {Name: "github", Version: "1.38.0"}, + {Name: "devoptics", Version: "2.0", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/2.0/devoptics.hpi"}, }, PriorityClassName: priorityClassName, NodeSelector: map[string]string{"kubernetes.io/os": "linux"}, diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index 2765a9aa..f3c06b4c 100644 --- a/test/e2e/test_utility.go +++ b/test/e2e/test_utility.go @@ -147,10 +147,10 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy }, }, Plugins: []v1alpha2.Plugin{ - {Name: "audit-trail", Version: "3.11"}, - {Name: "simple-theme-plugin", Version: "136.v23a_15f86c53d"}, - {Name: "github", Version: "1.36.0"}, - {Name: "devoptics", Version: "1.1973", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1973/devoptics.hpi"}, + {Name: "audit-trail", Version: "361.v82cde86c784e"}, + {Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, + {Name: "github", Version: "1.38.0"}, + {Name: "devoptics", Version: "2.0", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/2.0/devoptics.hpi"}, }, PriorityClassName: priorityClassName, NodeSelector: map[string]string{"kubernetes.io/os": "linux"}, diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index dcd9eb64..5e65ed39 100644 --- a/test/helm/helm_test.go +++ b/test/helm/helm_test.go @@ -80,9 +80,9 @@ var _ = Describe("Jenkins Controller with security validator", func() { {Name: "github", Version: "1.36.0"}, } validPlugins = []v1alpha2.Plugin{ - {Name: "simple-theme-plugin", Version: "136.v23a_15f86c53d"}, - {Name: "audit-trail", Version: "3.11"}, - {Name: "github", Version: "1.37.3.1"}, + {Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"}, + {Name: "audit-trail", Version: "361.v82cde86c784e"}, + {Name: "github", Version: "1.38.0"}, } )