public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-18 23:40:31 +02:00
Code Issues Releases Wiki Activity

Build multi-arch images (#693)

Browse Source 
* Build multi-arch images

* Reduce CPU requirements for jenkins instances in e2e tests

* Bump Jenkins LTS & plugins versions
This commit is contained in:
Guillaume Le Biller
2022-02-15 14:51:29 +01:00
committed by GitHub
parent e8414c09a8
commit 17a5bfec3e
13 changed files with 86 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/configuration_test.go
+11 -1
View File
@@ -23,6 +23,16 @@ import (
const e2e = "e2e"
var expectedBasePluginsList = []plugins.Plugin{
plugins.Must(plugins.New("configuration-as-code:1346.ve8cfa_3473c94")),
plugins.Must(plugins.New("git:4.10.3")),
plugins.Must(plugins.New("kubernetes:1.31.3")),
plugins.Must(plugins.New("kubernetes-credentials-provider:0.20")),
plugins.Must(plugins.New("job-dsl:1.78.1")),
plugins.Must(plugins.New("workflow-aggregator:2.6")),
plugins.Must(plugins.New("workflow-job:1145.v7f2433caa07f")),
}
func createUserConfigurationSecret(namespace string, stringData map[string]string) {
By("creating user configuration secret")
@@ -179,7 +189,7 @@ func verifyPlugins(jenkinsClient jenkinsclient.Jenkins, jenkins *v1alpha2.Jenkin
installedPlugins, err := jenkinsClient.GetPlugins(1)
Expect(err).NotTo(HaveOccurred())
for _, basePlugin := range plugins.BasePlugins() {
for _, basePlugin := range expectedBasePluginsList {
if found, ok := isPluginValid(installedPlugins, basePlugin); !ok {
Fail(fmt.Sprintf("Invalid plugin '%s', actual '%+v'", basePlugin, found))
}
test/e2e/jenkins_test.go
+1 -1
View File
@@ -104,7 +104,7 @@ func createJenkinsCRSafeRestart(name, namespace string, seedJob *[]v1alpha2.Seed
},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
corev1.ResourceCPU: resource.MustParse("250m"),
corev1.ResourceMemory: resource.MustParse("500Mi"),
},
Limits: corev1.ResourceList{
test/e2e/restorebackup_test.go
+1 -1
View File
@@ -146,7 +146,7 @@ func createJenkinsWithBackupAndRestoreConfigured(name, namespace string) *v1alph
},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
corev1.ResourceCPU: resource.MustParse("250m"),
corev1.ResourceMemory: resource.MustParse("500Mi"),
},
Limits: corev1.ResourceList{
test/e2e/test_utility.go
+2 -2
View File
@@ -21,7 +21,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest"
)
const JenkinsTestImage = "jenkins/jenkins:2.319.1-lts"
const JenkinsTestImage = "jenkins/jenkins:2.319.3-lts"
var (
Cfg *rest.Config
@@ -126,7 +126,7 @@ func RenderJenkinsCR(name, namespace string, seedJob *[]v1alpha2.SeedJob, groovy
},
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("1"),
corev1.ResourceCPU: resource.MustParse("250m"),
corev1.ResourceMemory: resource.MustParse("500Mi"),
},
Limits: corev1.ResourceList{
test/helm/helm_test.go
+1 -1
View File
@@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() {
cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug",
"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name),
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.303.2-lts"),
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.319.3-lts"),
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
output, err := cmd.CombinedOutput()
Expect(err).NotTo(HaveOccurred(), string(output))