From f7b6443fc69efdfe3d65c6840907c90ef5c3e669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Sat, 29 Jun 2019 17:06:38 +0200 Subject: [PATCH] Fix e2e tests --- pkg/apis/jenkins/v1alpha2/jenkins_types.go | 4 +++- pkg/apis/jenkins/v1alpha2/register.go | 8 ++++++++ test/e2e/jenkins.go | 1 + test/e2e/restorebackup_test.go | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/apis/jenkins/v1alpha2/jenkins_types.go b/pkg/apis/jenkins/v1alpha2/jenkins_types.go index 8cf14afd..7d924305 100644 --- a/pkg/apis/jenkins/v1alpha2/jenkins_types.go +++ b/pkg/apis/jenkins/v1alpha2/jenkins_types.go @@ -135,7 +135,9 @@ type Container struct { // Plugin defines Jenkins plugin type Plugin struct { - Name string `json:"name"` + // Name is the name of Jenkins plugin + Name string `json:"name"` + // Version is the version of Jenkins plugin Version string `json:"version"` } diff --git a/pkg/apis/jenkins/v1alpha2/register.go b/pkg/apis/jenkins/v1alpha2/register.go index 3a8d30c5..852b4c68 100644 --- a/pkg/apis/jenkins/v1alpha2/register.go +++ b/pkg/apis/jenkins/v1alpha2/register.go @@ -4,6 +4,7 @@ package v1alpha2 import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/runtime/scheme" ) @@ -36,6 +37,13 @@ func (in *Jenkins) GroupVersionKind() schema.GroupVersionKind { } } +func JenkinsTypeMeta() metav1.TypeMeta { + return metav1.TypeMeta{ + Kind: Kind, + APIVersion: SchemeGroupVersion.String(), + } +} + func init() { SchemeBuilder.Register(&Jenkins{}, &JenkinsList{}) } diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go index 247e0538..7a1fd010 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -67,6 +67,7 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S } jenkins := &v1alpha2.Jenkins{ + TypeMeta: v1alpha2.JenkinsTypeMeta(), ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, diff --git a/test/e2e/restorebackup_test.go b/test/e2e/restorebackup_test.go index dbfe2493..c4c3183b 100644 --- a/test/e2e/restorebackup_test.go +++ b/test/e2e/restorebackup_test.go @@ -72,6 +72,7 @@ func createPVC(t *testing.T, namespace string) { func createJenkinsWithBackupAndRestoreConfigured(t *testing.T, name, namespace string) *v1alpha2.Jenkins { containerName := "backup" jenkins := &v1alpha2.Jenkins{ + TypeMeta: v1alpha2.JenkinsTypeMeta(), ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace,