public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix e2e test

This commit is contained in:
Luigi Operoso 2024-02-22 18:27:01 +00:00
parent b729386f1a
commit 7a4233654a
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/v1alpha2/zz_generated.deepcopy.go
View File

@ -1,4 +1,3 @@
//go:build !ignore_autogenerated
// +build !ignore_autogenerated // +build !ignore_autogenerated
/* /*
@ -357,6 +356,11 @@ func (in *JenkinsMaster) DeepCopyInto(out *JenkinsMaster) {
*out = make([]Plugin, len(*in)) *out = make([]Plugin, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.LatestPlugins != nil {
in, out := &in.LatestPlugins, &out.LatestPlugins
*out = new(bool)
**out = **in
}
if in.HostAliases != nil { if in.HostAliases != nil {
in, out := &in.HostAliases, &out.HostAliases in, out := &in.HostAliases, &out.HostAliases
*out = make([]corev1.HostAlias, len(*in)) *out = make([]corev1.HostAlias, len(*in))

8
test/e2e/jenkins_test.go
View File

@ -125,10 +125,10 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed
}, },
}, },
Plugins: []v1alpha2.Plugin{ Plugins: []v1alpha2.Plugin{
{Name: "audit-trail", Version: "3.11"}, {Name: "audit-trail", Version: "361.v82cde86c784e"},
{Name: "simple-theme-plugin", Version: "136.v23a_15f86c53d"}, {Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"},
{Name: "github", Version: "1.36.0"}, {Name: "github", Version: "1.38.0"},
{Name: "devoptics", Version: "1.1973", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1973/devoptics.hpi"}, {Name: "devoptics", Version: "2.0", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/2.0/devoptics.hpi"},
}, },
PriorityClassName: priorityClassName, PriorityClassName: priorityClassName,
NodeSelector: map[string]string{"kubernetes.io/os": "linux"}, NodeSelector: map[string]string{"kubernetes.io/os": "linux"},

8
test/e2e/test_utility.go
View File

@ -147,10 +147,10 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy
}, },
}, },
Plugins: []v1alpha2.Plugin{ Plugins: []v1alpha2.Plugin{
{Name: "audit-trail", Version: "3.11"}, {Name: "audit-trail", Version: "361.v82cde86c784e"},
{Name: "simple-theme-plugin", Version: "136.v23a_15f86c53d"}, {Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"},
{Name: "github", Version: "1.36.0"}, {Name: "github", Version: "1.38.0"},
{Name: "devoptics", Version: "1.1973", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1973/devoptics.hpi"}, {Name: "devoptics", Version: "2.0", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/2.0/devoptics.hpi"},
}, },
PriorityClassName: priorityClassName, PriorityClassName: priorityClassName,
NodeSelector: map[string]string{"kubernetes.io/os": "linux"}, NodeSelector: map[string]string{"kubernetes.io/os": "linux"},

6
test/helm/helm_test.go
View File

@ -80,9 +80,9 @@ var _ = Describe("Jenkins Controller with security validator", func() {
{Name: "github", Version: "1.36.0"}, {Name: "github", Version: "1.36.0"},
} }
validPlugins = []v1alpha2.Plugin{ validPlugins = []v1alpha2.Plugin{
{Name: "simple-theme-plugin", Version: "136.v23a_15f86c53d"}, {Name: "simple-theme-plugin", Version: "176.v39740c03a_a_f5"},
{Name: "audit-trail", Version: "3.11"}, {Name: "audit-trail", Version: "361.v82cde86c784e"},
{Name: "github", Version: "1.37.3.1"}, {Name: "github", Version: "1.38.0"},
} }
) )