mirror of
https://github.com/jenkinsci/kubernetes-operator.git
synced 2026-10-06 16:11:11 +02:00
#4 Update e2e tests
This commit is contained in:
@@ -161,7 +161,7 @@ func verifyJenkinsMasterPodAttributes(t *testing.T, jenkins *v1alpha2.Jenkins) {
|
||||
assert.Equal(t, jenkins.Spec.Master.NodeSelector, jenkinsPod.Spec.NodeSelector)
|
||||
|
||||
assert.Equal(t, resources.JenkinsMasterContainerName, jenkinsPod.Spec.Containers[0].Name)
|
||||
assert.Equal(t, len(jenkins.Spec.Master.Containers)+1, len(jenkinsPod.Spec.Containers))
|
||||
assert.Equal(t, len(jenkins.Spec.Master.Containers), len(jenkinsPod.Spec.Containers))
|
||||
|
||||
for _, actualContainer := range jenkinsPod.Spec.Containers {
|
||||
if actualContainer.Name == resources.JenkinsMasterContainerName {
|
||||
|
||||
+2
-3
@@ -76,8 +76,7 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S
|
||||
Annotations: map[string]string{"test": "label"},
|
||||
Containers: []v1alpha2.Container{
|
||||
{
|
||||
Name: resources.JenkinsMasterContainerName,
|
||||
Image: "jenkins/jenkins",
|
||||
Name: resources.JenkinsMasterContainerName,
|
||||
Env: []v1.EnvVar{
|
||||
{
|
||||
Name: "TEST_ENV",
|
||||
@@ -115,7 +114,7 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S
|
||||
},
|
||||
},
|
||||
Plugins: []v1alpha2.Plugin{
|
||||
{Name: "audit-trail:", Version: "2.4"},
|
||||
{Name: "audit-trail", Version: "2.4"},
|
||||
{Name: "simple-theme-plugin", Version: "0.5.1"},
|
||||
},
|
||||
NodeSelector: map[string]string{"kubernetes.io/hostname": "minikube"},
|
||||
|
||||
Reference in New Issue
Block a user