From cc35dcfc725a763b5ecdb1d9e37eb2c42e76be91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Sun, 22 Mar 2020 19:29:56 +0100 Subject: [PATCH] #190 Allow set quay.io/openshift/origin-jenkins image in e2e tests --- test/e2e/cr.go | 13 +++++++++++++ test/e2e/cr_openshift.go | 31 +++++++++++++++++++++++++++++++ test/e2e/jenkins.go | 1 + 3 files changed, 45 insertions(+) create mode 100644 test/e2e/cr.go create mode 100644 test/e2e/cr_openshift.go diff --git a/test/e2e/cr.go b/test/e2e/cr.go new file mode 100644 index 00000000..48639680 --- /dev/null +++ b/test/e2e/cr.go @@ -0,0 +1,13 @@ +// +build !OpenShift + +package e2e + +import ( + "testing" + + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" +) + +func updateJenkinsCR(t *testing.T, jenkins *v1alpha2.Jenkins) { + // do nothing +} diff --git a/test/e2e/cr_openshift.go b/test/e2e/cr_openshift.go new file mode 100644 index 00000000..3dc724cd --- /dev/null +++ b/test/e2e/cr_openshift.go @@ -0,0 +1,31 @@ +// +build OpenShift + +package e2e + +import ( + "testing" + + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" + + corev1 "k8s.io/api/core/v1" +) + +func updateJenkinsCR(t *testing.T, jenkins *v1alpha2.Jenkins) { + jenkins.Spec.Master.Containers[0].Image = "quay.io/openshift/origin-jenkins" + jenkins.Spec.Master.Containers[0].Command = []string{ + "bash", + "-c", + "/var/jenkins/scripts/init.sh && exec /usr/bin/go-init -main /usr/libexec/s2i/run", + } + jenkins.Spec.Master.Containers[0].Env = append(jenkins.Spec.Master.Containers[0].Env, + corev1.EnvVar{ + Name: "JENKINS_SERVICE_NAME", + Value: resources.GetJenkinsHTTPServiceName(jenkins), + }, + corev1.EnvVar{ + Name: "JNLP_SERVICE_NAME", + Value: resources.GetJenkinsSlavesServiceName(jenkins), + }, + ) +} diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go index 76b6a6e6..d9f83a5e 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -168,6 +168,7 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S Name: resources.GetResourceName(jenkins), }, } + updateJenkinsCR(t, jenkins) t.Logf("Jenkins CR %+v", *jenkins) if err := framework.Global.Client.Create(context.TODO(), jenkins, nil); err != nil {