Merge pull request #16644 from gabemontero/jenkins-ext-test-tune

Automatic merge from submit-queue.

reverse default for jenkins ext test mem monitor

@openshift/devex ptal

(per recent @bparees request to quiet down / rework ext failure debug given natural evolution)

Author: openshift-merge-robot

test/extended/builds/pipeline.go

@@ -143,7 +143,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 	g.BeforeEach(func() {
 		setupJenkins()
 
-		if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+		if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 			ticker = jenkins.StartJenkinsMemoryTracking(oc, oc.Namespace())
 		}
 
@@ -161,7 +161,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Pipeline with maven slave", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 				ticker.Stop()
 			}
 		})
@@ -192,7 +192,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Pipeline using config map slave", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsGCStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsGCStats) != "" {
 				g.By("stopping jenkins gc tracking")
 				ticker.Stop()
 			}
@@ -228,7 +228,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Pipeline using imagestream slave", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsGCStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsGCStats) != "" {
 				g.By("stopping jenkins gc tracking")
 				ticker.Stop()
 			}
@@ -264,7 +264,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Pipeline using imagestreamtag slave", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsGCStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsGCStats) != "" {
 				g.By("stopping jenkins gc tracking")
 				ticker.Stop()
 			}
@@ -300,7 +300,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Pipeline using jenkins-client-plugin", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 				ticker.Stop()
 			}
 		})
@@ -331,7 +331,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Pipeline with env vars", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 				ticker.Stop()
 			}
 		})
@@ -447,7 +447,7 @@ var _ = g.Describe("[Feature:Builds][Slow] openshift pipeline build", func() {
 
 	g.Context("Blue-green pipeline", func() {
 		g.AfterEach(func() {
-			if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+			if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 				ticker.Stop()
 			}
 		})

test/extended/image_ecosystem/jenkins_plugin.go

@@ -126,7 +126,7 @@ var _ = g.Describe("[image_ecosystem][jenkins][Slow] openshift pipeline plugin",
 
 	g.AfterEach(func() {
 
-		if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+		if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 			ticker.Stop()
 		}
 
@@ -217,7 +217,7 @@ var _ = g.Describe("[image_ecosystem][jenkins][Slow] openshift pipeline plugin",
 			o.Expect(err).NotTo(o.HaveOccurred())
 		}
 
-		if os.Getenv(jenkins.DisableJenkinsMemoryStats) == "" {
+		if os.Getenv(jenkins.EnableJenkinsMemoryStats) != "" {
 			ticker = jenkins.StartJenkinsMemoryTracking(oc, jenkinsNamespace)
 		}
 

test/extended/util/jenkins/monitor.go

@@ -23,8 +23,8 @@ type JobMon struct {
 }
 
 const (
-	DisableJenkinsMemoryStats = "DISABLE_JENKINS_MEMORY_MONITORING"
-	DisableJenkinsGCStats     = "DISABLE_JENKINS_GC_MONITORING"
+	EnableJenkinsMemoryStats = "ENABLE_JENKINS_MEMORY_MONITORING"
+	EnableJenkinsGCStats     = "ENABLE_JENKINS_GC_MONITORING"
 )
 
 // Designed to match if RSS memory is greater than 500000000  (i.e. > 476MB)