fix tests, add wget and helm-docs
This commit is contained in:
		
							parent
							
								
									dc18d7446a
								
							
						
					
					
						commit
						3d02d4ba0a
					
				| 
						 | 
					@ -135,7 +135,7 @@ jenkins:
 | 
				
			||||||
  #    repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git
 | 
					  #    repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git
 | 
				
			||||||
  seedJobs: []
 | 
					  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: ""
 | 
					  seedJobAgentImage: ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Resource limit/request for Jenkins
 | 
					  # Resource limit/request for Jenkins
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -31,6 +31,8 @@
 | 
				
			||||||
        devShells.default = nixpkgs.legacyPackages.${system}.mkShell {
 | 
					        devShells.default = nixpkgs.legacyPackages.${system}.mkShell {
 | 
				
			||||||
          packages = [
 | 
					          packages = [
 | 
				
			||||||
              pkgs.gnumake
 | 
					              pkgs.gnumake
 | 
				
			||||||
 | 
					              pkgs.wget
 | 
				
			||||||
 | 
					              pkgs.helm-docs
 | 
				
			||||||
              go_15_pkgs.go
 | 
					              go_15_pkgs.go
 | 
				
			||||||
              golangci_pkgs.golangci-lint
 | 
					              golangci_pkgs.golangci-lint
 | 
				
			||||||
          ];
 | 
					          ];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -113,7 +113,7 @@ func TestEnsureSeedJobs(t *testing.T) {
 | 
				
			||||||
		var agentDeployment appsv1.Deployment
 | 
							var agentDeployment appsv1.Deployment
 | 
				
			||||||
		err = fakeClient.Get(ctx, types.NamespacedName{Namespace: jenkins.Namespace, Name: agentDeploymentName(*jenkins, AgentName)}, &agentDeployment)
 | 
							err = fakeClient.Get(ctx, types.NamespacedName{Namespace: jenkins.Namespace, Name: agentDeploymentName(*jenkins, AgentName)}, &agentDeployment)
 | 
				
			||||||
		assert.NoError(t, err)
 | 
							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) {
 | 
						t.Run("delete agent deployment when no seed jobs", func(t *testing.T) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue