From 3a7a4049f3ebede040eab5501bb92455bd7b7da9 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Wed, 31 Jul 2019 11:11:15 +0200 Subject: [PATCH] Improve groovy script checker --- pkg/controller/jenkins/groovy/groovy.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/controller/jenkins/groovy/groovy.go b/pkg/controller/jenkins/groovy/groovy.go index 15b594f7..399ec216 100644 --- a/pkg/controller/jenkins/groovy/groovy.go +++ b/pkg/controller/jenkins/groovy/groovy.go @@ -58,9 +58,11 @@ func (g *Groovy) EnsureSingle(source, name, hash, groovyScript string) (requeue var appliedGroovyScripts []v1alpha2.AppliedGroovyScript for _, ags := range g.jenkins.Status.AppliedGroovyScripts { - if g.configurationType != ags.ConfigurationType || ags.Source != source || ags.Name != name { - appliedGroovyScripts = append(appliedGroovyScripts, ags) + if g.configurationType == ags.ConfigurationType && ags.Source == source && ags.Name == name { + continue } + + appliedGroovyScripts = append(appliedGroovyScripts, ags) } appliedGroovyScripts = append(appliedGroovyScripts, v1alpha2.AppliedGroovyScript{ ConfigurationType: g.configurationType,