mirror of
https://github.com/jenkinsci/kubernetes-operator.git
synced 2026-10-18 14:01:04 +02:00
chore: update to latest lts, update plugins, remove devbots, add devcontainer (#835)
Update to the latest lts Update plugins Remove devbots Initial devcontainer config
This commit is contained in:
@@ -25,12 +25,12 @@ const e2e = "e2e"
|
||||
|
||||
var expectedBasePluginsList = []plugins.Plugin{
|
||||
plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")),
|
||||
plugins.Must(plugins.New("git:5.0.0")),
|
||||
plugins.Must(plugins.New("kubernetes:3909.v1f2c633e8590")),
|
||||
plugins.Must(plugins.New("git:5.0.1")),
|
||||
plugins.Must(plugins.New("kubernetes:3923.v294a_d4250b_91")),
|
||||
plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")),
|
||||
plugins.Must(plugins.New("job-dsl:1.83")),
|
||||
plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")),
|
||||
plugins.Must(plugins.New("workflow-job:1289.vd1c337fd5354")),
|
||||
plugins.Must(plugins.New("workflow-job:1292.v27d8cc3e2602")),
|
||||
}
|
||||
|
||||
func createUserConfigurationSecret(namespace string, stringData map[string]string) {
|
||||
|
||||
@@ -244,7 +244,7 @@ func restartJenkinsMasterPod(jenkins *v1alpha2.Jenkins) {
|
||||
Eventually(func() (bool, error) {
|
||||
jenkinsPod = getJenkinsMasterPod(jenkins)
|
||||
return jenkinsPod.DeletionTimestamp != nil, nil
|
||||
}, 30*retryInterval, retryInterval).Should(BeTrue())
|
||||
}, 45*retryInterval, retryInterval).Should(BeTrue())
|
||||
|
||||
_, _ = fmt.Fprintf(GinkgoWriter, "Jenkins master pod has been restarted\n")
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"sigs.k8s.io/controller-runtime/pkg/envtest"
|
||||
)
|
||||
|
||||
const JenkinsTestImage = "jenkins/jenkins:2.387.2-lts"
|
||||
const JenkinsTestImage = "jenkins/jenkins:2.387.3-lts"
|
||||
|
||||
var (
|
||||
Cfg *rest.Config
|
||||
|
||||
@@ -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.387.2-lts"),
|
||||
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.387.3-lts"),
|
||||
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
|
||||
output, err := cmd.CombinedOutput()
|
||||
Expect(err).NotTo(HaveOccurred(), string(output))
|
||||
|
||||
Reference in New Issue
Block a user