#4 Update e2e tests

pkg/controller/jenkins/configuration/backuprestore/backuprestore.go

@@ -98,6 +98,10 @@ func (bar *BackupAndRestore) Validate() bool {
 // Restore performs Jenkins restore backup operation
 func (bar *BackupAndRestore) Restore(jenkinsClient jenkinsclient.Jenkins) error {
 	jenkins := bar.jenkins
+	if len(jenkins.Spec.Restore.ContainerName) == 0 || jenkins.Spec.Restore.Action.Exec == nil {
+		bar.logger.V(log.VDebug).Info("Skipping restore backup, backup restore not configured")
+		return nil
+	}
 	if jenkins.Status.RestoredBackup != 0 {
 		bar.logger.V(log.VDebug).Info("Skipping restore backup, backup already restored")
 		return nil
@@ -141,6 +145,10 @@ func (bar *BackupAndRestore) Restore(jenkinsClient jenkinsclient.Jenkins) error
 // Backup performs Jenkins backup operation
 func (bar *BackupAndRestore) Backup() error {
 	jenkins := bar.jenkins
+	if len(jenkins.Spec.Backup.ContainerName) == 0 || jenkins.Spec.Backup.Action.Exec == nil {
+		bar.logger.V(log.VDebug).Info("Skipping restore backup, backup restore not configured")
+		return nil
+	}
 	if jenkins.Status.PendingBackup == jenkins.Status.LastBackup {
 		bar.logger.V(log.VDebug).Info("Skipping backup")
 		return nil

test/e2e/configuration_test.go

@@ -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 {

test/e2e/jenkins.go

@@ -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"},