From 3d02d4ba0a317d6f2fd86745eb30d850ef25eca5 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Wed, 21 Feb 2024 09:44:07 +0100 Subject: [PATCH] fix tests, add wget and helm-docs --- chart/jenkins-operator/values.yaml | 2 +- flake.nix | 2 ++ pkg/configuration/user/seedjobs/seedjobs_test.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index be0d0570..d264256c 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -135,7 +135,7 @@ jenkins: # repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git seedJobs: [] - # SeedJobAgentImage defines the image that will be used by the seed job agent. If not defined jenkins/inbound-agent:4.10-3 will be used. + # SeedJobAgentImage defines the image that will be used by the seed job agent. If not defined jenkins/inbound-agent:3206.vb_15dcf73f6a_9-3 will be used. seedJobAgentImage: "" # Resource limit/request for Jenkins diff --git a/flake.nix b/flake.nix index 7a00f3e8..8d1648cf 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,8 @@ devShells.default = nixpkgs.legacyPackages.${system}.mkShell { packages = [ pkgs.gnumake + pkgs.wget + pkgs.helm-docs go_15_pkgs.go golangci_pkgs.golangci-lint ]; diff --git a/pkg/configuration/user/seedjobs/seedjobs_test.go b/pkg/configuration/user/seedjobs/seedjobs_test.go index 6e29b82f..dc2169e9 100644 --- a/pkg/configuration/user/seedjobs/seedjobs_test.go +++ b/pkg/configuration/user/seedjobs/seedjobs_test.go @@ -113,7 +113,7 @@ func TestEnsureSeedJobs(t *testing.T) { var agentDeployment appsv1.Deployment err = fakeClient.Get(ctx, types.NamespacedName{Namespace: jenkins.Namespace, Name: agentDeploymentName(*jenkins, AgentName)}, &agentDeployment) assert.NoError(t, err) - assert.Equal(t, "jenkins/inbound-agent:4.10-3", agentDeployment.Spec.Template.Spec.Containers[0].Image) + assert.Equal(t, "jenkins/inbound-agent:3206.vb_15dcf73f6a_9-3", agentDeployment.Spec.Template.Spec.Containers[0].Image) }) t.Run("delete agent deployment when no seed jobs", func(t *testing.T) {